mpg123/mpg123.patch

Fri, 16 Jan 2009 10:58:21 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 16 Jan 2009 10:58:21 +0100
changeset 92
645923d1e875
permissions
-rw-r--r--

Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.

     1 Index: src/Makefile.in
     2 --- src/Makefile.in.orig	2007-12-05 02:36:29 +0100
     3 +++ src/Makefile.in	2007-12-05 08:34:08 +0100
     4 @@ -57,7 +57,7 @@
     5  	term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT)
     6  mpg123_OBJECTS = $(am_mpg123_OBJECTS)
     7  am__DEPENDENCIES_1 =
     8 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
     9 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl
    10  depcomp = $(SHELL) $(top_srcdir)/build/depcomp
    11  am__depfiles_maybe = depfiles
    12  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    13 @@ -294,7 +294,7 @@
    15  # AM_CPPFLAGS =
    16  mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@
    17 -mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@
    18 +mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -static
    19  # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS.
    20  INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123
    21  # libltdl is not mentioned here... it's not that trivial
    22 Index: src/output/Makefile.in
    23 --- src/output/Makefile.in.orig	2007-12-05 02:36:30 +0100
    24 +++ src/output/Makefile.in	2007-12-05 08:33:30 +0100
    25 @@ -212,7 +212,7 @@
    26  output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS)
    27  @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@am_output_win32_la_rpath = -rpath \
    28  @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@	$(pkglibdir)
    29 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
    30 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl
    31  depcomp = $(SHELL) $(top_srcdir)/build/depcomp
    32  am__depfiles_maybe = depfiles
    33  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

mercurial