mpg123/mpg123.patch@a6cd892638c1 (annotated)
mpg123/mpg123.patch
Sat, 03 Oct 2009 16:18:52 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Oct 2009 16:18:52 +0200
- changeset 220
- a6cd892638c1
- permissions
- -rw-r--r--
Update version, adjust corresponding buildconf, and correct logic.
1: Make minor corrections and improvements to scripts patch logic.
2: Upgrade to most recent stable release version 3.0.2.
3: Force selection of a single db backend, as multiple ones never
were supported (changing 'with_db<end>' identifiers accordingly.)
4: Unfortunately add gawk requirement although only partly needed.
5: Add openssl::with_threads requirement to solve strange and hard
to debug problems on Solaris leading to connection failures:
'host-dir JobId 0: Error: openssl.c:86 Connect failure: ERR=error:1408F10B:SSL routines:SSL3_GET_RECORD:wrong version number'
and
'host-dir JobId 40: Fatal error: TLS negotiation failed with FD at "back1.host.com:9102"'
| michael@39 | 1 | Index: src/Makefile.in |
| michael@39 | 2 | --- src/Makefile.in.orig 2007-12-05 02:36:29 +0100 |
| michael@39 | 3 | +++ src/Makefile.in 2007-12-05 08:34:08 +0100 |
| michael@39 | 4 | @@ -57,7 +57,7 @@ |
| michael@39 | 5 | term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) |
| michael@39 | 6 | mpg123_OBJECTS = $(am_mpg123_OBJECTS) |
| michael@39 | 7 | am__DEPENDENCIES_1 = |
| michael@39 | 8 | -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. |
| michael@39 | 9 | +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl |
| michael@39 | 10 | depcomp = $(SHELL) $(top_srcdir)/build/depcomp |
| michael@39 | 11 | am__depfiles_maybe = depfiles |
| michael@39 | 12 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
| michael@39 | 13 | @@ -294,7 +294,7 @@ |
| michael@39 | 14 | |
| michael@39 | 15 | # AM_CPPFLAGS = |
| michael@39 | 16 | mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ |
| michael@39 | 17 | -mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ |
| michael@39 | 18 | +mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -static |
| michael@39 | 19 | # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. |
| michael@39 | 20 | INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123 |
| michael@39 | 21 | # libltdl is not mentioned here... it's not that trivial |
| michael@39 | 22 | Index: src/output/Makefile.in |
| michael@39 | 23 | --- src/output/Makefile.in.orig 2007-12-05 02:36:30 +0100 |
| michael@39 | 24 | +++ src/output/Makefile.in 2007-12-05 08:33:30 +0100 |
| michael@39 | 25 | @@ -212,7 +212,7 @@ |
| michael@39 | 26 | output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS) |
| michael@39 | 27 | @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@am_output_win32_la_rpath = -rpath \ |
| michael@39 | 28 | @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@ $(pkglibdir) |
| michael@39 | 29 | -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src |
| michael@39 | 30 | +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl |
| michael@39 | 31 | depcomp = $(SHELL) $(top_srcdir)/build/depcomp |
| michael@39 | 32 | am__depfiles_maybe = depfiles |
| michael@39 | 33 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
