Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sound
In directory vz-cvs-3.sog:/tmp/cvs-serv12257/sound
Added Files:
libao2.info libao2.patch libao4.info libao4.patch madplay.info
madplay.patch
Log Message:
to 10.7 with OK
--- NEW FILE: madplay.patch ---
--- madplay-0.15.2b/audio_carbon.c.bak 2005-04-04 02:03:58.000000000 -0700
+++ madplay-0.15.2b/audio_carbon.c 2005-04-04 02:04:39.000000000 -0700
@@ -94,7 +94,7 @@
}
static
-int wait(struct buffer *buffer)
+int carbon_wait(struct buffer *buffer)
{
if (MPWaitOnSemaphore(buffer->semaphore, kDurationForever) != noErr) {
audio_error = _("MPWaitOnSemaphore() failed");
@@ -234,7 +234,11 @@
break;
case 16:
- audio_pcm = audio_pcm_s16be;
+ #ifdef __BIG_ENDIAN__
+ audio_pcm = audio_pcm_s16be;
+ #else
+ audio_pcm = audio_pcm_s16le;
+ #endif
break;
}
@@ -263,7 +263,7 @@
/* wait for block to finish playing */
if (buffer->pcm_nsamples == 0) {
- if (wait(buffer) == -1)
+ if (carbon_wait(buffer) == -1)
return -1;
buffer->pcm_length = 0;
--- NEW FILE: libao4.patch ---
diff -ruN libao-1.1.0/doc/Makefile.in libao-1.1.0-patched/doc/Makefile.in
--- libao-1.1.0/doc/Makefile.in 2011-02-22 23:54:29.000000000 +0100
+++ libao-1.1.0-patched/doc/Makefile.in 2011-02-23 15:22:16.000000000 +0100
@@ -202,7 +202,7 @@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
--- NEW FILE: libao4.info ---
# DISCLAIMER: Max Horn is the sole maintainer of this package.
# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
# Preferably, send a patch to me instead of making changes yourself!
# If that is not possible due to extra urgency, at least send me a mail.
#
# Explanation: I am sick and tired of getting back to my packages and
# discovering that people have messed with it. I am then forced to
# retrace their steps, find out who, when and why did make a certain
# change etc. -- i.e. it makes my life as maintainer harder.
# Furthermore, as maintainer I am responsible for problems caused by my
# packages. But I am not willing to take responsibility for something I
# did not do. In particular, for changes that other people introduced
# behind my back, no matter how good and noble their intentions were. As
# such, I may see myself forced to drop responsibility for (and hence,
# maintainership of) the affected package.
Package: libao4
Version: 1.1.0
Revision: 1
Maintainer: Max Horn <[email protected]>
Depends: %N-shlibs (= %v-%r), macosx
Conflicts: libao2
Replaces: libao2
BuildDepends: pkgconfig (>= 0.21-1), fink (>= 0.24.12)
BuildDependsOnly: True
Source: http://downloads.xiph.org/releases/ao/libao-%v.tar.gz
Source-MD5: 2b2508c29bc97e4dc218fa162cf883c8
PatchFile: %n.patch
PatchFile-MD5: d13ecfbb673f3f8f12a69eabba14e488
SetCPPFLAGS: -DAO_SYSTEM_CONFIG='"%p/etc/libao.conf"'
ConfigureParams: <<
--mandir=%p/share/man \
--disable-dependency-tracking \
--disable-arts \
--disable-esd \
--disable-oss \
--disable-X
<<
InstallScript: <<
make install mandir=%p/share/man DESTDIR=%d
# Strip bogus inherited_linker_flags from plugin
perl -pi -e "s/inherited_linker_flags=.*$/inherited_linker_flags=''/"
%i/lib/ao/plugins-4/libmacosx.la
# Install a default config files
mkdir -p %i/etc
echo "default_driver=macosx" >> %i/etc/libao.conf
<<
ConfFiles: %p/etc/libao.conf
DocFiles: README COPYING AUTHORS
SplitOff: <<
Package: %N-shlibs
Files: lib/libao.*.dylib lib/ao/plugins-4/*.so
Shlibs: %p/lib/libao.4.dylib 5.0.0 %n (>= 1.0.0-1)
DocFiles: README COPYING AUTHORS
<<
Description: Audio output library
DescDetail: <<
libao is a way to easily add cross-platform audio output to your program.
Output devices are implemented as dynamic plugins. The Fink package
only builds the macosx plugin.
<<
DescPort: <<
- Uses patch to change documentation location.
<<
Homepage: http://www.xiph.org/ao/
License: GPL
--- NEW FILE: madplay.info ---
# DISCLAIMER: Max Horn is the sole maintainer of this package.
# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
# Preferably, send a patch to me instead of making changes yourself!
# If that is not possible due to extra urgency, at least send me a mail.
#
# Explanation: I am sick and tired of getting back to my packages and
# discovering that people have messed with it. I am then forced to
# retrace their steps, find out who, when and why did make a certain
# change etc. -- i.e. it makes my life as maintainer harder.
# Furthermore, as maintainer I am responsible for problems caused by my
# packages. But I am not willing to take responsibility for something I
# did not do. In particular, for changes that other people introduced
# behind my back, no matter how good and noble their intentions were. As
# such, I may see myself forced to drop responsibility for (and hence,
# maintainership of) the affected package.
Package: madplay
Version: 0.15.2b
Revision: 6
Depends: libmad-shlibs (>= 0.15.1b-4), libid3tag-shlibs (>= 0.15.1b-4)
BuildDepends: libmad (>= 0.15.1b-4), libid3tag (>= 0.15.1b-4), libgettext3-dev,
gettext-bin, gettext-tools, libiconv-dev, fink (>= 0.24.12)
Replaces: mad-bin
#Conflicts: mad-bin
Maintainer: Max Horn <[email protected]>
Source: mirror:sourceforge:mad/%n-%v.tar.gz
Source-MD5: 6814b47ceaa99880c754c5195aa1aac1
PatchFile: %n.patch
PatchFile-MD5: eff61a43a5d8bef8bbc5bb6bc9b65c74
PatchScript: <<
%{default_script}
perl -pi.bak -e 's,-flat_namespace -undefined suppress,-twolevel_namespace
-undefined error,g' configure
perl -pi.bak -e 's,\$\{CPP=\"cc -E -traditional-cpp\"\},\$\{CPP=\"cc -E\"\},g;
s,-march=i486,,g' configure
<<
ConfigureParams: --mandir=%p/share/man --without-esd
InstallScript: make install DESTDIR=%d
DocFiles: CHANGES COPYING COPYRIGHT CREDITS README TODO VERSION
Description: MPEG audio decoder and player
DescDetail: <<
`madplay' is a command-line MPEG audio decoder and
player based on the MAD library (libmad).
<<
DescPackaging: <<
Disabled ESD support, to reduce the number of dependencies.
Modify configure script to *not* specify -march=486, as that causes problems:
On 32bit systems, it fails because i486 does not support MMX/SSE, on
64bit systems it complains because this is not a 64bit enabled CPU type.
Versioned deps on libmad and libid3tag for gettext -> libgettext3 transition.
<<
License: GPL
Homepage: http://www.underbit.com/products/mad/
--- NEW FILE: libao2.patch ---
diff -ru libao-0.8.8/configure libao-0.8.8-patched/configure
--- libao-0.8.8/configure 2007-05-24 12:51:52.000000000 +0200
+++ libao-0.8.8-patched/configure 2010-03-27 13:24:36.000000000 +0100
@@ -20094,9 +20094,9 @@
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;;
*-darwin*)
PLUGIN_LDFLAGS="-module -avoid-version"
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char
-Ddlsym=dlsym_auto_underscore"
- CFLAGS="-D__NO_MATH_INLINES -fsigned-char
-Ddlsym=dlsym_auto_underscore"
- PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char
-Ddlsym=dlsym_auto_underscore" ;;
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-D__NO_MATH_INLINES -fsigned-char"
+ PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
*)
PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
@@ -20203,7 +20204,7 @@
DLOPEN_FLAG='(RTLD_LAZY)'
SHARED_LIB_EXT='.sl'
;;
- *openbsd* | *netbsd* | *solaris2.7)
+ *darwin* | *openbsd* | *netbsd* | *solaris2.7)
DLOPEN_FLAG='(RTLD_LAZY)'
SHARED_LIB_EXT='.so'
;;
diff -ru libao-0.8.8/doc/Makefile.in libao-0.8.8-patched/doc/Makefile.in
--- libao-0.8.8/doc/Makefile.in 2007-05-24 12:51:43.000000000 +0200
+++ libao-0.8.8-patched/doc/Makefile.in 2010-03-27 13:25:24.000000000 +0100
@@ -161,7 +161,7 @@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
diff -ru libao-0.8.8/src/plugins/macosx/ao_macosx.c
libao-0.8.8-patched/src/plugins/macosx/ao_macosx.c
--- libao-0.8.8/src/plugins/macosx/ao_macosx.c 2007-05-24 11:19:07.000000000
+0200
+++ libao-0.8.8-patched/src/plugins/macosx/ao_macosx.c 2010-03-27
13:24:36.000000000 +0100
@@ -173,6 +173,26 @@
return 0;
}
+ if (internal->outputStreamBasicDescription.mChannelsPerFrame !=
format->channels)
+ {
+ internal->outputStreamBasicDescription.mChannelsPerFrame =
format->channels;
+ internal->outputStreamBasicDescription.mBytesPerFrame =
+
internal->outputStreamBasicDescription.mChannelsPerFrame * sizeof (float);
+ internal->outputStreamBasicDescription.mBytesPerPacket =
+ internal->outputStreamBasicDescription.mBytesPerFrame *
+ internal->outputStreamBasicDescription.mFramesPerPacket;
+ status = AudioDeviceSetProperty(internal->outputDeviceID, 0, 0,
0,
+ kAudioDevicePropertyStreamFormat,
+ sizeof (internal->outputStreamBasicDescription),
+ &internal->outputStreamBasicDescription);
+ if (status != noErr)
+ {
+ fprintf(stderr, "ao_macosx_open: AudioDeviceSetProperty
returned %.*s when setting kAudioDevicePropertyStreamFormat\n",
+ (int) sizeof (status), (char *) &status);
+ return 0;
+ }
+ }
+
fprintf(stderr, "hardware format...\n");
fprintf(stderr, "%f mSampleRate\n",
internal->outputStreamBasicDescription.mSampleRate);
fprintf(stderr, "%c%c%c%c mFormatID\n",
(int)(internal->outputStreamBasicDescription.mFormatID & 0xff000000) >> 24,
--- NEW FILE: libao2.info ---
# DISCLAIMER: Max Horn is the sole maintainer of this package.
# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
# Preferably, send a patch to me instead of making changes yourself!
# If that is not possible due to extra urgency, at least send me a mail.
#
# Explanation: I am sick and tired of getting back to my packages and
# discovering that people have messed with it. I am then forced to
# retrace their steps, find out who, when and why did make a certain
# change etc. -- i.e. it makes my life as maintainer harder.
# Furthermore, as maintainer I am responsible for problems caused by my
# packages. But I am not willing to take responsibility for something I
# did not do. In particular, for changes that other people introduced
# behind my back, no matter how good and noble their intentions were. As
# such, I may see myself forced to drop responsibility for (and hence,
# maintainership of) the affected package.
Package: libao2
Version: 0.8.8
Revision: 2
Maintainer: Max Horn <[email protected]>
Depends: %N-shlibs (= %v-%r), macosx
Conflicts: libao4
Replaces: libao4
BuildDepends: pkgconfig (>= 0.21-1), fink (>= 0.24.12)
BuildDependsOnly: True
Source: http://downloads.xiph.org/releases/ao/libao-%v.tar.gz
Source-MD5: b92cba3cbcf1ee9bc221118a85d23dcd
PatchFile: %n.patch
PatchFile-MD5: 6c520d76c0f793e9045aee443d474277
SetCPPFLAGS: -DAO_SYSTEM_CONFIG='"%p/etc/libao.conf"'
ConfigureParams: <<
--mandir=%p/share/man \
--disable-dependency-tracking \
--disable-arts \
--disable-esd \
--disable-oss \
--disable-X
<<
InstallScript: <<
make install mandir=%p/share/man DESTDIR=%d
# Install a default config files
mkdir -p %i/etc
echo "default_driver=macosx" >> %i/etc/libao.conf
<<
ConfFiles: %p/etc/libao.conf
DocFiles: README COPYING AUTHORS
SplitOff: <<
Package: %N-shlibs
Files: lib/libao.*.dylib lib/ao/plugins-2/*.so
Shlibs: %p/lib/libao.2.dylib 4.0.0 %n (>= 0.8.3-1)
DocFiles: README COPYING AUTHORS
<<
Description: Audio output library
DescDetail: <<
libao is a way to easily add cross-platform audio output to your program.
Output devices are implemented as dynamic plugins. The Fink package
only builds the macosx plugin.
<<
DescPort: <<
- Uses patch to change documentation location.
- Patch to fix multi-channel output
- Patch to fix plugin linkage and dlopening
- Patch to remove _dlsym_auto_underscore, which could cause link issues
for external code using libao2.
<<
DescPackaging: <<
Originally packaged by Ben Hines
<<
Homepage: http://www.xiph.org/ao/
License: GPL
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
