[Buildroot] [PATCH 1/2] sdl_mixer: add patch to fix SDL_mixer.pc for static linking

[Buildroot] [PATCH 1/2] sdl_mixer: add patch to fix SDL_mixer.pc for static linking

[Rodrigo Rebello]

A 'Libs.private' field needs to be present and properly defined in the
pkg-config file in order for static linking against SDL_mixer to work.

Besides adding the mentioned field, the included patch 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.

Finally, force 'autogen.sh' to be run before the configure step since
we're patching configure.in.

Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
---
 ...Add-Libs.private-field-to-pkg-config-file.patch | 64 ++++++++++++++++++++++
 package/sdl_mixer/sdl_mixer.mk                     |  8 +++
 2 files changed, 72 insertions(+)
 create mode 100644 package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch

diff --git a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
new file mode 100644
index 0000000..e0e8571
--- /dev/null
+++ b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch
@@ -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
+
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index a602b6e..96cbe68 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -10,6 +10,14 @@ SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
 SDL_MIXER_LICENSE = zlib
 SDL_MIXER_LICENSE_FILES = COPYING
 
+# We're patching configure.in, but SDL_mixer is not compatible with our
+# autoreconf mechanism, so we have to do it manually instead of setting
+# SDL_MIXER_AUTORECONF = YES
+define SDL_MIXER_RUN_AUTOGEN
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+SDL_MIXER_PRE_CONFIGURE_HOOKS += SDL_MIXER_RUN_AUTOGEN
+
 SDL_MIXER_INSTALL_STAGING = YES
 SDL_MIXER_DEPENDENCIES = sdl
 SDL_MIXER_CONF_OPTS = \
-- 
2.1.4

[Buildroot] [PATCH 2/2] chocolate-doom: add patch to fix static linking

[Rodrigo Rebello]

This commit adds a backported upstream patch which modifies the
configure script so that it uses pkg-config to detect libraries and
their static linking dependencies.

Fixes:

  http://autobuild.buildroot.net/results/d98/d981499ad82121d58fb7584b55d09c484cb6aa49/
  http://autobuild.buildroot.net/results/e41/e419f29e14edd28cbf48278bef725b696ae8ef70/
  http://autobuild.buildroot.net/results/d8f/d8fe9b5bdb262e939d4150804ea34777c91d3c04/
  ...

Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
---
 ...004-configure-Switch-to-pkg-config-macros.patch | 217 +++++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch

diff --git a/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch b/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch
new file mode 100644
index 0000000..2618396
--- /dev/null
+++ b/package/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch
@@ -0,0 +1,217 @@
+From 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9 Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Thu, 25 Feb 2016 22:55:04 -0500
+Subject: [PATCH] configure: Switch to pkg-config macros.
+
+All dependency libraries install pkg-config .pc files nowadays, which
+makes the process of looking them up a lot simpler. Get rid of the SDL
+workaround macro as it's not needed.
+
+[Backported from upstream commit 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9.
+Fixes static linking issues with SDL_mixer.]
+
+Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
+---
+ configure.ac                    | 117 ++++++++++++++--------------------------
+ opl/examples/Makefile.am        |   2 +-
+ src/Makefile.am                 |   7 ++-
+ textscreen/Makefile.am          |   2 +-
+ textscreen/examples/Makefile.am |   2 +-
+ 5 files changed, 49 insertions(+), 81 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b03485..48f83ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,89 +33,54 @@ then
+         CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+ fi
+ 
+-dnl Search for SDL ...
+-
+-AM_PATH_SDL(1.1.3)
+-
+-# Add the SDL compiler flags to the default compiler flag variables. 
+-# It is important to do this now, before checking for headers and
+-# library functions.  The reason being that on Windows, sdl-config
+-# sets the -mno-cygwin compiler option in order to generate MinGW 
+-# executables.  If we don't do this now, we might end up discovering
+-# header files that are not actually available to us when we come
+-# to compile.
+-
+-CFLAGS="$CFLAGS $SDL_CFLAGS"
+-LDFLAGS="$LDFLAGS $SDL_LIBS"
+-
+-# On some platforms, SDL renames main() to SDL_main() using a #define,
+-# so that its own main, stored in the SDLmain library, can be run first.
+-# Unfortunately, this causes problems for autoconf, which builds
+-# test programs to probe the system.  All library/header/symbol checks
+-# must be run in this block, that performs a workaround for the problem.
+-
+-AC_SDL_MAIN_WORKAROUND([
+-
+-    # Check for SDL_mixer.
+-
+-    AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[
+-        SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer"
+-    ],[
+-        echo "*** Could not find SDL_mixer.  Please install it."
+-        exit -1
+-    ])
+-
+-    # Check for SDL_net.
+-
+-    AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
+-        SDLNET_LIBS="$SDLNET_LIBS -lSDL_net"
+-    ],[
+-        echo "*** Could not find SDL_net.  Please install it."
+-        exit -1
+-    ])
+-
+-    # Check for libsamplerate.
+-    AC_ARG_WITH([libsamplerate],
+-    AS_HELP_STRING([--without-libsamplerate],
+-        [Build without libsamplerate @<:@default=check@:>@]),
+-    [],
+-    [
+-        [with_libsamplerate=check]
+-    ])
+-    AS_IF([test "x$with_libsamplerate" != xno], [
+-        AC_CHECK_LIB(samplerate, src_new, [], [
+-            AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE(
+-                [--with-libsamplerate was given, but test for libsamplerate failed])
+-            ])
++PKG_CHECK_MODULES([SDL], [sdl])
++PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer])
++PKG_CHECK_MODULES([SDLNET], [SDL_net])
++
++# Check for libsamplerate.
++AC_ARG_WITH([libsamplerate],
++AS_HELP_STRING([--without-libsamplerate],
++    [Build without libsamplerate @<:@default=check@:>@]),
++[],
++[
++    [with_libsamplerate=check]
++])
++AS_IF([test "x$with_libsamplerate" != xno], [
++    PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.1.8], [
++        AC_DEFINE([HAVE_LIBSAMPLERATE], [1], [libsamplerate installed])
++    ], [
++        AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE(
++            [--with-libsamplerate was given, but test for libsamplerate failed])
+         ])
+     ])
+-    # Check for libpng.
+-    AC_ARG_WITH([libpng],
+-    AS_HELP_STRING([--without-libpng],
+-        [Build without libpng @<:@default=check@:>@]),
+-    [],
+-    [
+-        [with_libpng=check]
+-    ])
+-    AS_IF([test "x$with_libpng" != xno], [
+-        AC_CHECK_LIB(z, zlibVersion)
+-        AC_CHECK_LIB(png, png_get_io_ptr, [], [
+-            AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE(
+-                [--with-libpng was given, but test for libpng failed])
+-            ])
++])
++# Check for libpng.
++AC_ARG_WITH([libpng],
++AS_HELP_STRING([--without-libpng],
++    [Build without libpng @<:@default=check@:>@]),
++[],
++[
++    [with_libpng=check]
++])
++AS_IF([test "x$with_libpng" != xno], [
++    PKG_CHECK_MODULES([PNG], [libpng >= 1.6.10], [
++        AC_DEFINE([HAVE_LIBPNG], [1], [libpng installed])
++    ], [
++        AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE(
++            [--with-libpng was given, but test for libpng failed])
+         ])
+     ])
+-    AC_CHECK_LIB(m, log)
++])
++AC_CHECK_LIB(m, log)
+ 
+-    AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
+-    AC_CHECK_FUNCS(mmap ioperm)
++AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
++AC_CHECK_FUNCS(mmap ioperm)
+ 
+-    # OpenBSD I/O i386 library for I/O port access.
+-    # (64 bit has the same thing with a different name!)
++# OpenBSD I/O i386 library for I/O port access.
++# (64 bit has the same thing with a different name!)
+ 
+-    AC_CHECK_LIB(i386, i386_iopl)
+-    AC_CHECK_LIB(amd64, amd64_iopl)
+-])
++AC_CHECK_LIB(i386, i386_iopl)
++AC_CHECK_LIB(amd64, amd64_iopl)
+ 
+ case $host in
+   *cygwin* | *mingw* )
+diff --git a/opl/examples/Makefile.am b/opl/examples/Makefile.am
+index 9afcd51..54c37f8 100644
+--- a/opl/examples/Makefile.am
++++ b/opl/examples/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -I$(top_srcdir)/opl
++AM_CFLAGS = -I$(top_srcdir)/opl @SDL_CFLAGS@
+ 
+ noinst_PROGRAMS=droplay
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 78ee3ba..9624e01 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,7 +21,8 @@ execgames_SCRIPTS = $(SETUP_BINARIES)
+ AM_CFLAGS = -I$(top_srcdir)/textscreen            \
+             -I$(top_srcdir)/opl                   \
+             -I$(top_srcdir)/pcsound               \
+-            @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
++            @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@     \
++            @SAMPLERATE_CFLAGS@ @PNG_CFLAGS@
+ 
+ # Common source files used by absolutely everything:
+ 
+@@ -150,7 +151,9 @@ EXTRA_LIBS =                                               \
+                @LDFLAGS@                                   \
+                @SDL_LIBS@                                  \
+                @SDLMIXER_LIBS@                             \
+-               @SDLNET_LIBS@
++               @SDLNET_LIBS@                               \
++               @SAMPLERATE_LIBS@                           \
++               @PNG_LIBS@
+ 
+ if HAVE_WINDRES
+ @PROGRAM_PREFIX at doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
+diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
+index 628d4ff..427ed40 100644
+--- a/textscreen/Makefile.am
++++ b/textscreen/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS = -I$(top_srcdir)/src
++AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@
+ 
+ CTAGS_ARGS=-I TXT_UNCAST_ARG+
+ 
+diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am
+index 4632d92..b857748 100644
+--- a/textscreen/examples/Makefile.am
++++ b/textscreen/examples/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-AM_CFLAGS =  -I$(top_srcdir)/src -I$(top_srcdir)/textscreen
++AM_CFLAGS =  -I$(top_srcdir)/src -I$(top_srcdir)/textscreen @SDL_CFLAGS@
+ 
+ noinst_PROGRAMS=guitest calculator
+ 
+-- 
+2.1.4
+
-- 
2.1.4

[Buildroot] [PATCH 1/2] sdl_mixer: add patch to fix SDL_mixer.pc for static linking

[Thomas Petazzoni]

Dear Rodrigo Rebello,

On Tue,  1 Mar 2016 02:42:05 -0300, Rodrigo Rebello wrote:
> A 'Libs.private' field needs to be present and properly defined in the
> pkg-config file in order for static linking against SDL_mixer to work.
> 
> Besides adding the mentioned field, the included patch 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.
> 
> Finally, force 'autogen.sh' to be run before the configure step since
> we're patching configure.in.
> 
> Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>

Thanks for working on this!


> +# We're patching configure.in, but SDL_mixer is not compatible with our
> +# autoreconf mechanism, so we have to do it manually instead of setting
> +# SDL_MIXER_AUTORECONF = YES
> +define SDL_MIXER_RUN_AUTOGEN
> +	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
> +endef
> +SDL_MIXER_PRE_CONFIGURE_HOOKS += SDL_MIXER_RUN_AUTOGEN
> +

If you do this, then you need to manually add host-autoconf
host-automake and host-libtool to SDL_MIXER_DEPENDENCIES. It is
normally done automatically by <pkg>_AUTORECONF = YES, but since you're
not using it, you must do it manually.

Of course, it would be even better if SDL_mixer
configure.ac/Makefile.am would autoreconf properly.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] chocolate-doom: add patch to fix static linking

[Thomas Petazzoni]

Dear Rodrigo Rebello,

On Tue,  1 Mar 2016 02:42:06 -0300, Rodrigo Rebello wrote:
> This commit adds a backported upstream patch which modifies the
> configure script so that it uses pkg-config to detect libraries and
> their static linking dependencies.
> 
> Fixes:
> 
>   http://autobuild.buildroot.net/results/d98/d981499ad82121d58fb7584b55d09c484cb6aa49/
>   http://autobuild.buildroot.net/results/e41/e419f29e14edd28cbf48278bef725b696ae8ef70/
>   http://autobuild.buildroot.net/results/d8f/d8fe9b5bdb262e939d4150804ea34777c91d3c04/
>   ...
> 
> Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>

Thanks! Looks good, but since the patch adds pkg-config usage in the
configure script, the package should add host-pkgconf in its
dependencies.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] sdl_mixer: add patch to fix SDL_mixer.pc for static linking

[Rodrigo Rebello]

Thomas,

2016-03-01 5:19 GMT-03:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
[snip]
>> +# We're patching configure.in, but SDL_mixer is not compatible with our
>> +# autoreconf mechanism, so we have to do it manually instead of setting
>> +# SDL_MIXER_AUTORECONF = YES
>> +define SDL_MIXER_RUN_AUTOGEN
>> +     cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
>> +endef
>> +SDL_MIXER_PRE_CONFIGURE_HOOKS += SDL_MIXER_RUN_AUTOGEN
>> +
>
> If you do this, then you need to manually add host-autoconf
> host-automake and host-libtool to SDL_MIXER_DEPENDENCIES. It is
> normally done automatically by <pkg>_AUTORECONF = YES, but since you're
> not using it, you must do it manually.
>

Right. I'll add the missing dependencies and respin this patch.

Regards,
Rodrigo

[Buildroot] [PATCH 2/2] chocolate-doom: add patch to fix static linking

[Rodrigo Rebello]

Thomas,

2016-03-01 5:20 GMT-03:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Rodrigo Rebello,
>
> On Tue,  1 Mar 2016 02:42:06 -0300, Rodrigo Rebello wrote:
>> This commit adds a backported upstream patch which modifies the
>> configure script so that it uses pkg-config to detect libraries and
>> their static linking dependencies.
>>
>> Fixes:
>>
>>   http://autobuild.buildroot.net/results/d98/d981499ad82121d58fb7584b55d09c484cb6aa49/
>>   http://autobuild.buildroot.net/results/e41/e419f29e14edd28cbf48278bef725b696ae8ef70/
>>   http://autobuild.buildroot.net/results/d8f/d8fe9b5bdb262e939d4150804ea34777c91d3c04/
>>   ...
>>
>> Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
>
> Thanks! Looks good, but since the patch adds pkg-config usage in the
> configure script, the package should add host-pkgconf in its
> dependencies.
>

Yes, of course. I completely missed that. I also missed the fact that
the SDL static linking workaround can now be removed from
chocolate-doom.mk. I'll fix those and send an update.

Regards,
Rodrigo