update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,64 @@
|
||||
From abf3a1b9c9cdacb574c2b9cdbf3f2a5e18c39ab9 Mon Sep 17 00:00:00 2001
|
||||
From: Rodrigo Rebello <rprebello@gmail.com>
|
||||
Date: Mon, 29 Feb 2016 22:53:49 -0300
|
||||
Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file
|
||||
|
||||
In order to support static linking, SDL_mixer.pc should include a
|
||||
'Libs.private' field listing all the libraries that SDL_mixer requires.
|
||||
|
||||
This patch adds such a field and also modifies configure.in so that
|
||||
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
|
||||
required by SDL from being listed twice when 'pkg-config --libs --static
|
||||
SDL_mixer' is run (they're already shown because of the 'Requires: sdl'
|
||||
line in SDL_mixer.pc). Makefile.in is also adjusted accordingly.
|
||||
|
||||
Upstream status: submitted
|
||||
https://bugzilla.libsdl.org/show_bug.cgi?id=3278
|
||||
|
||||
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
|
||||
---
|
||||
Makefile.in | 2 +-
|
||||
SDL_mixer.pc.in | 1 +
|
||||
configure.in | 1 -
|
||||
3 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 3d10565..ce4efd4 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -63,7 +63,7 @@ $(objects):
|
||||
.PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
|
||||
|
||||
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
|
||||
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(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)
|
||||
$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||
diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in
|
||||
index 1c4965d..d793521 100644
|
||||
--- a/SDL_mixer.pc.in
|
||||
+++ b/SDL_mixer.pc.in
|
||||
@@ -8,5 +8,6 @@ Description: mixer library for Simple DirectMedia Layer
|
||||
Version: @VERSION@
|
||||
Requires: sdl >= @SDL_VERSION@
|
||||
Libs: -L${libdir} -lSDL_mixer
|
||||
+Libs.private: @EXTRA_LDFLAGS@
|
||||
Cflags: -I${includedir}/SDL
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 2272b29..442eca6 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION,
|
||||
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
|
||||
)
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS"
|
||||
-EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SDL_LIBS"
|
||||
|
||||
dnl Check for math library
|
||||
AC_CHECK_LIB(m, pow, [LIBM="-lm"])
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
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:
|
||||
11
bsp/buildroot-2017.02.11/package/sdl_mixer/Config.in
Normal file
11
bsp/buildroot-2017.02.11/package/sdl_mixer/Config.in
Normal file
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_SDL_MIXER
|
||||
bool "SDL_mixer"
|
||||
depends on BR2_PACKAGE_SDL
|
||||
help
|
||||
SDL_mixer is a sample multi-channel audio mixer library.
|
||||
It supports any number of simultaneously playing channels of
|
||||
16 bit stereo audio, plus a single channel of music, mixed
|
||||
by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis, and
|
||||
SMPEG MP3 libraries.
|
||||
|
||||
http://www.libsdl.org/projects/SDL_mixer/
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SDL_mixer-1.2.12.tar.gz
|
||||
42
bsp/buildroot-2017.02.11/package/sdl_mixer/sdl_mixer.mk
Normal file
42
bsp/buildroot-2017.02.11/package/sdl_mixer/sdl_mixer.mk
Normal file
@@ -0,0 +1,42 @@
|
||||
################################################################################
|
||||
#
|
||||
# sdl_mixer
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SDL_MIXER_VERSION = 1.2.12
|
||||
SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
|
||||
SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
|
||||
SDL_MIXER_LICENSE = zlib
|
||||
SDL_MIXER_LICENSE_FILES = COPYING
|
||||
|
||||
SDL_MIXER_INSTALL_STAGING = YES
|
||||
SDL_MIXER_DEPENDENCIES = sdl
|
||||
|
||||
# We're patching configure.in, so we need to autoreconf
|
||||
SDL_MIXER_AUTORECONF = YES
|
||||
SDL_MIXER_AUTORECONF_OPTS = -Iacinclude
|
||||
|
||||
SDL_MIXER_CONF_OPTS = \
|
||||
--without-x \
|
||||
--with-sdl-prefix=$(STAGING_DIR)/usr \
|
||||
--disable-music-midi \
|
||||
--disable-music-mod \
|
||||
--disable-music-mp3 \
|
||||
--disable-music-flac # configure script fails when cross compiling
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMAD),y)
|
||||
SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
|
||||
SDL_MIXER_DEPENDENCIES += libmad
|
||||
else
|
||||
SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
|
||||
SDL_MIXER_CONF_OPTS += --enable-music-ogg
|
||||
SDL_MIXER_DEPENDENCIES += libvorbis
|
||||
else
|
||||
SDL_MIXER_CONF_OPTS += --disable-music-ogg
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user