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

Reintroduce patch for building local libvorbis with local libogg.

Browse Source
This commit is contained in:
lllucius@gmail.com 2013-11-08 06:55:31 +00:00
parent d146519cab
commit d282aa07ec
3 changed files with 105 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,9 +127,10 @@ library for endcoding and decoding Xiph.org's high-quality compressed audio
format.
Version in Audacity SVN: 1.3.3
Patches: autotools.patch: Fix all autotools warnings.
local-libogg.patch: configure patch that lets us build against a
local libogg if there isn't a system one.
Upstream Version: 1.3.3
lib-widget-extra
----------------

75
lib-src/libvorbis/configure vendored
View File

@ -12600,8 +12600,64 @@ $as_echo "no" >&6; }
fi
HAVE_OGG=no
if test "x$PKG_CONFIG" != "x"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ../libogg/include/ogg/ogg.h" >&5
$as_echo_n "checking for ../libogg/include/ogg/ogg.h... " >&6; }
if ${ac_cv_file____libogg_include_ogg_ogg_h+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "../libogg/include/ogg/ogg.h"; then
ac_cv_file____libogg_include_ogg_ogg_h=yes
else
ac_cv_file____libogg_include_ogg_ogg_h=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file____libogg_include_ogg_ogg_h" >&5
$as_echo "$ac_cv_file____libogg_include_ogg_ogg_h" >&6; }
if test "x$ac_cv_file____libogg_include_ogg_ogg_h" = xyes; then :
ogg_h_available="yes"
else
ogg_h_available="no"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ../libogg/Makefile" >&5
$as_echo_n "checking for ../libogg/Makefile... " >&6; }
if ${ac_cv_file____libogg_Makefile+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "../libogg/Makefile"; then
ac_cv_file____libogg_Makefile=yes
else
ac_cv_file____libogg_Makefile=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file____libogg_Makefile" >&5
$as_echo "$ac_cv_file____libogg_Makefile" >&6; }
if test "x$ac_cv_file____libogg_Makefile" = xyes; then :
ogg_configured="yes"
else
ogg_configured="no"
fi
if test "x$ogg_configured" = "xyes" && test "x$ogg_h_available" = "xyes" ; then
echo "Using local libogg library from Audacity lib-src directory."
OGG_LIBS="-L../.. -logg"
LIBS="-L../.. -logg"
OGG_CFLAGS="-I../../libogg/include"
else
if test "x$PKG_CONFIG" != "x"
then
succeeded=no
@ -12699,9 +12755,9 @@ $as_echo "$OGG_LIBS" >&6; }
HAVE_OGG=no
fi
fi
if test "x$HAVE_OGG" = "xno"
then
fi
if test "x$HAVE_OGG" = "xno"
then
# Check whether --with-ogg was given.
if test "${with_ogg+set}" = set; then :
@ -12851,16 +12907,17 @@ rm -f core conftest.err conftest.$ac_objext \
rm -f conf.oggtest
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
ac_fn_c_check_func "$LINENO" "oggpack_writealign" "ac_cv_func_oggpack_writealign"
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
ac_fn_c_check_func "$LINENO" "oggpack_writealign" "ac_cv_func_oggpack_writealign"
if test "x$ac_cv_func_oggpack_writealign" = xyes; then :
else
as_fn_error $? "Ogg >= 1.0 required !" "$LINENO" 5
fi
LIBS=$libs_save
LIBS=$libs_save
fi
fi

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

@ -236,18 +236,43 @@ AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
PKG_PROG_PKG_CONFIG
HAVE_OGG=no
if test "x$PKG_CONFIG" != "x"
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
if test "x$HAVE_OGG" = "xno"
then
dnl fall back to the old school test
XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
LIBS=$libs_save
dnl Audacity-specific code by dmazzoni:
dnl If libogg is in the same parent directory and it has been
dnl configured already, then we assume that libogg is going to
dnl be built, too.
AC_CHECK_FILE(../libogg/include/ogg/ogg.h,
ogg_h_available="yes",
ogg_h_available="no")
AC_CHECK_FILE(../libogg/Makefile,
ogg_configured="yes",
ogg_configured="no")
if test "x$ogg_configured" = "xyes" && test "x$ogg_h_available" = "xyes" ; then
echo "Using local libogg library from Audacity lib-src directory."
AC_SUBST(OGG_CFLAGS)
AC_SUBST(OGG_LIBS)
OGG_LIBS="-L../.. -logg"
LIBS="-L../.. -logg"
OGG_CFLAGS="-I../../libogg/include"
else
if test "x$PKG_CONFIG" != "x"
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
if test "x$HAVE_OGG" = "xno"
then
dnl fall back to the old school test
XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
LIBS=$libs_save
fi
fi
dnl --------------------------------------------------