Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 07:39:42 +02:00
Code Issues Releases Wiki Activity

Add and apply autotools.patch to fix all autotools warnings for libvorbis.

Browse Source
This commit is contained in:
benjamin.drung@gmail.com 2013-10-25 11:35:39 +00:00
parent d1bb18d3de
commit ed0e3f66b5
9 changed files with 119 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-src/audacity-patches.txt
View File

@ -136,7 +136,7 @@ libvorbis
library for endcoding and decoding Xiph.org's high-quality compressed audio
format.
Version in Audacity SVN: 1.3.3
Patches: None
Patches: autotools.patch: Fix all autotools warnings.
Upstream Version: 1.3.3
liblrdf

2
lib-src/libvorbis/Makefile.am
View File

@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz

6
lib-src/libvorbis/acinclude.m4
View File

@ -121,8 +121,8 @@ AC_DEFUN([PKG_CHECK_MODULES], [
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
pkg_config_min_version=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
@ -148,7 +148,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi

107
lib-src/libvorbis/autotools.patch Normal file
View File

@ -0,0 +1,107 @@
Index: Makefile.am
===================================================================
--- Makefile.am (revision 12764)
+++ Makefile.am (working copy)
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I m4
+
#AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2
AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
Index: acinclude.m4
===================================================================
--- acinclude.m4 (revision 12764)
+++ acinclude.m4 (working copy)
@@ -121,8 +121,8 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ pkg_config_min_version=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
@@ -148,7 +148,7 @@
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
Index: configure.ac
===================================================================
--- configure.ac (revision 12764)
+++ configure.ac (working copy)
@@ -11,13 +11,11 @@
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-
dnl Library versioning
dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
Index: examples/Makefile.am
===================================================================
--- examples/Makefile.am (revision 12764)
+++ examples/Makefile.am (working copy)
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
noinst_PROGRAMS = decoder_example encoder_example chaining_example\
vorbisfile_example seeking_example
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (revision 12764)
+++ lib/Makefile.am (working copy)
@@ -2,7 +2,7 @@
SUBDIRS = modes books
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
lib_LTLIBRARIES = libvorbis.la libvorbisfile.la libvorbisenc.la
Index: test/Makefile.am
===================================================================
--- test/Makefile.am (revision 12764)
+++ test/Makefile.am (working copy)
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
check_PROGRAMS = test
Index: vq/Makefile.am
===================================================================
--- vq/Makefile.am (revision 12764)
+++ vq/Makefile.am (working copy)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
EXTRA_PROGRAMS = latticebuild latticetune huffbuild distribution
CLEANFILES = $(EXTRA_PROGRAMS)

6
lib-src/libvorbis/configure.ac
View File

@ -11,12 +11,10 @@ AC_CONFIG_SRCDIR([lib/mdct.c])
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
AC_CONFIG_MACRO_DIR([m4])
dnl Library versioning
dnl - library source changed -> increment REVISION

2
lib-src/libvorbis/examples/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
noinst_PROGRAMS = decoder_example encoder_example chaining_example\
vorbisfile_example seeking_example

2
lib-src/libvorbis/lib/Makefile.am
View File

@ -2,7 +2,7 @@
SUBDIRS = modes books
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
lib_LTLIBRARIES = libvorbis.la libvorbisfile.la libvorbisenc.la

2
lib-src/libvorbis/test/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
check_PROGRAMS = test

2
lib-src/libvorbis/vq/Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
AM_CPPFLAGS = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
EXTRA_PROGRAMS = latticebuild latticetune huffbuild distribution
CLEANFILES = $(EXTRA_PROGRAMS)