libmad/trunk/libmad.patch

   1 diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am
   2 --- libmad-0.15.1b.orig/Makefile.am     2004-02-17 02:02:03.000000000 +0000
   3 +++ libmad-0.15.1b/Makefile.am  2005-08-25 12:08:04.000000000 +0000
   4 @@ -33,9 +33,12 @@
   5  minimad_INCLUDES =
   6  minimad_LDADD =                libmad.la
   7
   8 -EXTRA_DIST =           mad.h.sed  \
   9 +EXTRA_DIST =           mad.h.sed mad.pc.in \
  10                         CHANGES COPYRIGHT CREDITS README TODO VERSION
  11
  12 +pkgconfigdir = $(libdir)/pkgconfig
  13 +pkgconfig_DATA= mad.pc
  14 +
  15  exported_headers =     version.h fixed.h bit.h timer.h stream.h frame.h  \
  16                         synth.h decoder.h
  17
  18 diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in
  19 --- libmad-0.15.1b.orig/Makefile.in     2004-02-17 02:33:23.000000000 +0000
  20 +++ libmad-0.15.1b/Makefile.in  2005-08-25 12:09:34.000000000 +0000
  21 @@ -14,6 +14,8 @@
  22
  23  @SET_MAKE@
  24
  25 +pkgconfigdir = $(libdir)/pkgconfig
  26 +pkgconfig_DATA = mad.pc
  27
  28  SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES)
  29
  30 @@ -43,7 +45,7 @@
  31         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  32         $(srcdir)/config.h.in $(srcdir)/libmad.list.in \
  33         $(top_srcdir)/configure COPYING INSTALL TODO config.guess \
  34 -       config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
  35 +       config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in
  36  subdir = .
  37  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  38  am__aclocal_m4_deps = $(top_srcdir)/configure.ac
  39 @@ -53,7 +55,7 @@
  40   configure.lineno configure.status.lineno
  41  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  42  CONFIG_HEADER = config.h
  43 -CONFIG_CLEAN_FILES = libmad.list
  44 +CONFIG_CLEAN_FILES = libmad.list mad.pc
  45  am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
  46  libLTLIBRARIES_INSTALL = $(INSTALL)
  47  LTLIBRARIES = $(lib_LTLIBRARIES)
  48 @@ -218,7 +220,7 @@
  49  minimad_SOURCES = minimad.c
  50  minimad_INCLUDES =
  51  minimad_LDADD = libmad.la
  52 -EXTRA_DIST = mad.h.sed  \
  53 +EXTRA_DIST = mad.h.sed  mad.pc.in \
  54                         CHANGES COPYRIGHT CREDITS README TODO VERSION
  55
  56  exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h  \
  57 @@ -298,6 +300,28 @@
  58         rm -f stamp-h1
  59         touch $@
  60
  61 +mad.pc: $(top_builddir)/config.status mad.pc.in
  62 +       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  63 +
  64 +install-pkgconfigDATA: $(pkgconfig_DATA)
  65 +       @$(NORMAL_INSTALL)
  66 +       $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
  67 +       @list='$(pkgconfig_DATA)'; for p in $$list; do \
  68 +         if test -f $(srcdir)/$$p; then \
  69 +           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
  70 +           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
  71 +         else if test -f $$p; then \
  72 +           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
  73 +           $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
  74 +         fi; fi; \
  75 +       done
  76 +
  77 +uninstall-pkgconfigDATA:
  78 +       @$(NORMAL_UNINSTALL)
  79 +       list='$(pkgconfig_DATA)'; for p in $$list; do \
  80 +         rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
  81 +       done
  82 +
  83  distclean-hdr:
  84         -rm -f config.h stamp-h1
  85  libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in
  86 @@ -726,7 +750,7 @@
  87
  88  info-am:
  89
  90 -install-data-am: install-includeHEADERS
  91 +install-data-am: install-includeHEADERS install-pkgconfigDATA
  92
  93  install-exec-am: install-libLTLIBRARIES
  94
  95 @@ -757,7 +781,7 @@
  96  ps-am:
  97
  98  uninstall-am: uninstall-includeHEADERS uninstall-info-am \
  99 -       uninstall-libLTLIBRARIES
 100 +       uninstall-libLTLIBRARIES install-pkgconfigDATA
 101
 102  uninstall-info: uninstall-info-recursive
 103
 104 diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in
 105 --- libmad-0.15.1b.orig/mad.pc.in       1970-01-01 00:00:00.000000000 +0000
 106 +++ libmad-0.15.1b/mad.pc.in    2005-08-25 12:08:04.000000000 +0000
 107 @@ -0,0 +1,10 @@
 108 +prefix=@prefix@
 109 +exec_prefix=@exec_prefix@
 110 +libdir=@libdir@
 111 +includedir=@includedir@
 112 +
 113 +Name: MAD
 114 +Description: libmad - MPEG audio decoder library
 115 +Version: @VERSION@
 116 +Libs: -L${libdir} -lmad
 117 +Cflags: