libao: drop libtool files, reorder sections, sync patch offsets. (#862)

This commit is contained in:
fbrosson
2016-11-08 08:29:44 +00:00
committed by GitHub
parent dbf37e5be5
commit ff4b9a32e5
2 changed files with 27 additions and 23 deletions

View File

@@ -6,12 +6,7 @@ output, WAV files, AU files, RAW files, OSS, ALSA, aRts, PulseAudio, esd, Mac \
OS X, Windows, AIX, Sun/NetBSD/OpenBSD, IRIX, NAS, RoarAudio and OpenBSD's \
sndio.
"
HOMEPAGE="http://xiph.org/ao/"
SOURCE_URI="http://downloads.xiph.org/releases/ao/libao-$portVersion.tar.gz"
CHECKSUM_SHA256="03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf"
LICENSE="GNU GPL v2"
HOMEPAGE="https://xiph.org/ao/"
COPYRIGHT="1999 Aaron Holtzman
2000 Rik Hemsley
2000 Timothy J. Wood
@@ -22,8 +17,11 @@ COPYRIGHT="1999 Aaron Holtzman
2008 Alexandre Ratchov
2008-2010 Philipp 'ph3-der-loewe' Schafft
2010-2011 Monty"
REVISION="2"
LICENSE="GNU GPL v2"
REVISION="3"
SOURCE_URI="http://downloads.xiph.org/releases/ao/libao-$portVersion.tar.gz"
CHECKSUM_SHA256="03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf"
PATCHES="libao-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -35,6 +33,15 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
libao${secondaryArchSuffix}_devel = $portVersion
devel:libao$secondaryArchSuffix = 4.1.0 compat >= 4
"
REQUIRES_devel="
libao$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
@@ -49,8 +56,6 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
PATCHES="libao-$portVersion.patchset"
BUILD()
{
# sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M*
@@ -65,6 +70,10 @@ BUILD()
INSTALL()
{
make install
# remove libtool files
rm -f $libDir/libao.la $libDir/ao/plugins*/libhaiku.la
prepareInstalledDevelLibs libao
fixPkgconfig
@@ -78,12 +87,7 @@ INSTALL()
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libao${secondaryArchSuffix}_devel = $portVersion
devel:libao$secondaryArchSuffix = 4.1.0 compat >= 4
"
REQUIRES_devel="
libao$secondaryArchSuffix == $portVersion base
"
TEST()
{
make check
}

View File

@@ -5,7 +5,7 @@ Subject: Add Haiku Media Kit audio output driver.
diff --git a/configure.ac b/configure.ac
index b5aba33..eb60271 100644
index 67a06f8..8f2de8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,13 +30,15 @@ dnl Check for programs
@@ -100,7 +100,7 @@ index b5aba33..eb60271 100644
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADER(audio/audiolib.h, dummy="no-op", have_nas=no)
@@ -458,6 +463,12 @@ fi
@@ -457,6 +462,12 @@ AC_SUBST(PULSE_LIBS)
AM_CONDITIONAL(HAVE_PULSE,test "x$have_pulse" = xyes)
@@ -113,7 +113,7 @@ index b5aba33..eb60271 100644
dnl Orphaned driver. We'll probably dump it soon.
AM_CONDITIONAL(HAVE_SOLARIS,test "x$have_solaris" = xyes)
@@ -465,7 +476,7 @@ dnl Plugins get special LDFLAGS
@@ -464,7 +475,7 @@ dnl Plugins get special LDFLAGS
AC_SUBST(PLUGIN_LDFLAGS)
@@ -122,7 +122,7 @@ index b5aba33..eb60271 100644
AS_AC_EXPAND(LIBDIR, ${libdir})
AS_AC_EXPAND(INCLUDEDIR, ${includedir})
@@ -486,6 +497,7 @@ AC_MSG_RESULT([
@@ -485,6 +496,7 @@ AC_MSG_RESULT([
ALSA live output: ............ ${have_alsa}
ARTS live output: ............ ${have_arts}
ESD live output: ............. ${have_esd}