Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15109/sound
Modified Files:
esound.info esound.patch libcanberra-gtk0.info
libcanberra-gtk0.patch libcanberra0.info
Log Message:
latest gnome and kde3 to stable, along with .la cleaning and associated build
fixes and others uncovered while working on it, and other related packages
Index: libcanberra-gtk0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra-gtk0.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libcanberra-gtk0.info 15 Nov 2009 08:20:31 -0000 1.2
+++ libcanberra-gtk0.info 2 Nov 2010 15:46:18 -0000 1.3
@@ -1,79 +1,69 @@
Package: libcanberra-gtk0
-Version: 0.15
-Revision: 1
+Version: 0.23
+Revision: 2
Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz
-Source-MD5: 79c3c0a62e2c8c7c1906e9072a92763b
+Source-MD5: 83fb2fb7608c77f91904e12a867534fd
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- autoconf,
+ atk1 (>= 1.28.0-1),
+ autoconf2.6,
automake1.11,
- cairo (>= 1.8-1),
- expat1,
+ cairo (>= 1.8.8-3),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
- glib2-dev (>= 2.20.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gtk-doc (>= 1.9-1),
- gtk+2-dev (>= 2.16.0-1),
+ gtk-doc (>= 1.13-5),
+ gtk+2-dev (>= 2.18.0-1),
libcanberra0 (>= %v-1),
- libgettext3-dev,
- libiconv-dev,
- libogg (>= 1.1.4-1),
- libpng3,
+ libogg (>= 1.2.0-1),
libtool2,
libvorbis0 (>= 1.2.2-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- x11-dev,
- xft2-dev
+ x11-dev
<<
Depends: %n-shlibs (= %v-%r)
BuildDependsOnly: true
PatchFile: %n.patch
-Patchfile-MD5: fd72f18357dab064ba4b44da8bf43577
+Patchfile-MD5: 46edcd8be279d6ec6ca45cd4c96811e7
PatchScript: <<
%{default_script}
+ perl -pi -e 's/(-version-info|-avoid-version)/-no-undefined \1/'
src/Makefile.am
<<
-ConfigureParams: --disable-dependency-tracking --disable-static --enable-gtk
--disable-schemas-install --disable-lynx --disable-tdb --disable-gstreamer
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig
+ConfigureParams: --enable-dependency-tracking --disable-static --enable-gtk
--disable-schemas-install --disable-lynx --disable-tdb --disable-gstreamer
PKG_CONFIG_PATH=%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig
--disable-silent-rules
CompileScript: <<
autoreconf -fi
./configure %c
make plugin_LTLIBRARIES=
+ fink-package-precedence --prohibit-bdep %n .
<<
InstallScript: <<
make install DESTDIR=%d plugin_LTLIBRARIES=
rm %i/lib/pkgconfig/libcanberra.pc
rm %i/share/doc/libcanberra/README
rmdir %i/share/doc/libcanberra
+ rm %i/share/vala/vapi/libcanberra.vapi
<<
DocFiles: LGPL README
SplitOff: <<
Package: %N-shlibs
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gtk+2-shlibs (>= 2.16.0-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
libcanberra0-shlibs (>= %v-1),
- libgettext3-shlibs,
- libiconv,
- libogg-shlibs (>= 1.1.4-1),
- libpng3-shlibs,
- libtool2-shlibs,
- libvorbis0-shlibs (>= 1.2.2-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
x11
<<
Files: lib/libcanberra-gtk.*.dylib
@@ -91,25 +81,16 @@
<<
Depends: <<
%N-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2 (>= 2.26.0-1),
- gconf2-shlibs (>= 2.26.0-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gtk+2-shlibs (>= 2.16.0-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dpkg-base-files,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2 (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
libcanberra0-shlibs (>= %v-1),
- libgettext3-shlibs,
- libiconv,
- libogg-shlibs (>= 1.1.4-1),
- libpng3-shlibs,
- libtool2-shlibs,
- libvorbis0-shlibs (>= 1.2.2-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
x11
<<
DocFiles: LGPL README
Index: libcanberra0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra0.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libcanberra0.info 15 Nov 2009 08:20:31 -0000 1.2
+++ libcanberra0.info 2 Nov 2010 15:46:18 -0000 1.3
@@ -1,17 +1,17 @@
Package: libcanberra0
-Version: 0.15
-Revision: 1
+Version: 0.23
+Revision: 202
Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz
-Source-MD5: 79c3c0a62e2c8c7c1906e9072a92763b
+Source-MD5: 83fb2fb7608c77f91904e12a867534fd
BuildDepends: <<
fink (>= 0.24.12-1),
- glib2-dev (>= 2.20.0-1),
- gstreamer-0.10-dev (>= 0.10.24-1),
- gtk-doc (>= 1.9-1),
- libgettext3-dev,
+ fink-package-precedence,
+ glib2-dev (>= 2.22.0-1),
+ gstreamer-0.10-dev (>= 0.10.26-1),
+ gtk-doc (>= 1.13-5),
libiconv-dev,
- libogg (>= 1.1.4-1),
+ libogg (>= 1.2.0-1),
libtool2,
libvorbis0 (>= 1.2.2-1),
libxml2 (>= 2.6.30-1),
@@ -20,10 +20,12 @@
Depends: %n-shlibs (= %v-%r)
BuildDependsOnly: true
-ConfigureParams: --disable-dependency-tracking --disable-static --disable-gtk
--disable-lynx --disable-tdb --enable-gstreamer --enable-gtk-doc
+PatchScript: perl -pi -e 's/(-version-info|-avoid-version)/-no-undefined \1/'
src/Makefile.in
+ConfigureParams: --enable-dependency-tracking --disable-static --disable-gtk
--disable-lynx --disable-tdb --enable-gstreamer --enable-gtk-doc
--disable-silent-rules
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
CompileScript: <<
./configure %c
make
+ fink-package-precedence --prohibit-bdep %n .
<<
InstallScript: <<
make install DESTDIR=%d
@@ -35,11 +37,9 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- glib2-shlibs (>= 2.20.0-1),
- gstreamer-0.10-shlibs (>= 0.10.24-1),
- libgettext3-shlibs,
- libiconv,
- libogg-shlibs (>= 1.1.4-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gstreamer-0.10-shlibs (>= 0.10.26-1),
+ libogg-shlibs (>= 1.2.0-1),
libtool2-shlibs,
libvorbis0-shlibs (>= 1.2.2-1),
libxml2-shlibs (>= 2.6.30-1),
@@ -49,21 +49,11 @@
lib/libcanberra.*.dylib
lib/libcanberra-%v
<<
- Shlibs: %p/lib/libcanberra.0.dylib 2.0.0 %n (>= 0.6-1)
+ Shlibs: %p/lib/libcanberra.0.dylib 3.0.0 %n (>= 0.23-1)
DocFiles: LGPL README
<<
-SplitOff2: <<
- Package: canberra-plugins
- Depends: fink-obsolete-packages
- InstallScript: <<
- mkdir -p %i/share/doc/installed-packages
- touch %i/share/doc/installed-packages/%n
- <<
-<<
-DescPort: <<
-<<
DescPackaging: <<
Core lib doesn't use gtk and the gtk lib's libtool versioning
is independent, so don't build as part of the main lib pkgs.
@@ -72,14 +62,6 @@
tdb not in fink now--disable for consistency if we do get it.
- Plugins reverted canberra-plugins -> %N-shlibs as of 0.11-1.
- They are loaded by %N-shlibs and are now in libversioned dir.
- Third-party plugin packages (of which there are presently
- none) will have to be adjusted each time %v changes. Cannot
- have %N-shlibs:Conflicts:canberra-plugins and nuke it cleanly
- because old libcanberra-gtk0 and maybe other packages have
- Depends:canberra-plugins.
-
We do our own doc files our own ways and places.
<<
Index: esound.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/esound.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- esound.patch 16 Jul 2008 03:01:50 -0000 1.3
+++ esound.patch 2 Nov 2010 15:46:18 -0000 1.4
@@ -288,3 +288,15 @@
}
if (gInputDeviceID != kAudioDeviceUnknown) {
+diff -Naur esound-0.2.38.orig/esdlib.c esound-0.2.38/esdlib.c
+--- esound-0.2.38.orig/esdlib.c 2007-04-19 14:43:59.000000000 +0000
++++ esound-0.2.38/esdlib.c 2010-01-27 17:02:20.000000000 +0000
+@@ -708,7 +708,7 @@
+ if ( !host ) host = getenv("ESPEAKER");
+
+ display = getenv( "DISPLAY" );
+- if ( !(host && *host) && display ) {
++ if ( !(host && *host) && display /* Fink: launchd socket */ && display[0]
!= '/') {
+ /* no espeaker specified, but the app should be directed to a
+ remote display, so try routing the default port over there
+ and see if we strike gold */
Index: libcanberra-gtk0.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/libcanberra-gtk0.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libcanberra-gtk0.patch 15 Nov 2009 08:20:31 -0000 1.2
+++ libcanberra-gtk0.patch 2 Nov 2010 15:46:18 -0000 1.3
@@ -1,19 +1,19 @@
-diff -Nurd -x'*~' libcanberra-0.15.orig/Makefile.am
libcanberra-0.15/Makefile.am
---- libcanberra-0.15.orig/Makefile.am 2009-07-01 21:16:29.000000000 -0400
-+++ libcanberra-0.15/Makefile.am 2009-08-14 13:42:18.000000000 -0400
-@@ -19,7 +19,7 @@
- dist_doc_DATA = README
+diff -Nurd -x'*~' libcanberra-0.23.orig/Makefile.am
libcanberra-0.23/Makefile.am
+--- libcanberra-0.23.orig/Makefile.am 2009-09-11 17:59:30.000000000 -0400
++++ libcanberra-0.23/Makefile.am 2010-02-23 00:50:16.000000000 -0500
+@@ -26,7 +26,7 @@
+ vala/libcanberra.vapi \
+ vala/libcanberra-gtk.vapi
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
-SUBDIRS = src gtkdoc doc
+SUBDIRS = src doc
MAINTAINERCLEANFILES = README
noinst_DATA = README
-diff -Nurd -x'*~' libcanberra-0.15.orig/configure.ac
libcanberra-0.15/configure.ac
---- libcanberra-0.15.orig/configure.ac 2009-08-04 21:10:50.000000000 -0400
-+++ libcanberra-0.15/configure.ac 2009-08-14 13:42:18.000000000 -0400
-@@ -373,6 +373,7 @@
+diff -Nurd -x'*~' libcanberra-0.23.orig/configure.ac
libcanberra-0.23/configure.ac
+--- libcanberra-0.23.orig/configure.ac 2010-02-20 11:38:00.000000000 -0500
++++ libcanberra-0.23/configure.ac 2010-02-23 00:50:30.000000000 -0500
+@@ -375,6 +375,7 @@
HAVE_GTK=0
fi
@@ -21,10 +21,10 @@
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-diff -Nurd -x'*~' libcanberra-0.15.orig/src/Makefile.am
libcanberra-0.15/src/Makefile.am
---- libcanberra-0.15.orig/src/Makefile.am 2009-07-01 20:55:48.000000000
-0400
-+++ libcanberra-0.15/src/Makefile.am 2009-08-14 13:42:18.000000000 -0400
-@@ -31,14 +31,10 @@
+diff -Nurd -x'*~' libcanberra-0.23.orig/src/Makefile.am
libcanberra-0.23/src/Makefile.am
+--- libcanberra-0.23.orig/src/Makefile.am 2009-10-06 18:38:46.000000000
-0400
++++ libcanberra-0.23/src/Makefile.am 2010-02-23 01:35:06.000000000 -0500
+@@ -34,14 +34,10 @@
EXTRA_DIST = \
map-file
@@ -41,7 +41,7 @@
libcanberra_la_SOURCES = \
canberra.h \
-@@ -287,20 +283,22 @@
+@@ -290,20 +286,22 @@
canberra-gtk.h \
canberra-gtk.c
libcanberra_gtk_la_CFLAGS = \
@@ -51,7 +51,7 @@
libcanberra_gtk_la_LIBADD = \
$(GTK_LIBS) \
- libcanberra.la
-+ $(LIBCANBERRA_LIBS)
++ $(LIBCANBERRA_LIBS) -lX11 -L/usr/X11/lib -L/usr/X11R6/lib
libcanberra_gtk_la_LDFLAGS = \
-export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO)
@@ -68,7 +68,7 @@
libcanberra-gtk.la
libcanberra_gtk_module_la_LDFLAGS = \
-avoid-version -module -export-dynamic
-@@ -309,10 +307,11 @@
+@@ -312,10 +310,11 @@
canberra-gtk-play.c
canberra_gtk_play_LDADD = \
$(GTK_LIBS) \
@@ -78,7 +78,7 @@
canberra_gtk_play_CFLAGS = \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
-+ $(LIBCANBERRA_LIBS)
++ $(LIBCANBERRA_CFLAGS)
EXTRA_DIST += \
libcanberra-login-sound.desktop.in \
Index: esound.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound/esound.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- esound.info 29 Mar 2009 22:04:26 -0000 1.5
+++ esound.info 2 Nov 2010 15:46:18 -0000 1.6
@@ -1,8 +1,8 @@
Package: esound
-Version: 0.2.38
-Revision: 1
+Version: 0.2.41
+Revision: 2
BuildDependsOnly: True
-Depends: %N-bin (>= %v-%r), macosx
+Depends: %N-bin (>= %v-%r), macosx, pkgconfig
BuildDepends: fink (>= 0.24.12), audiofile (>= 0.2.4-1), macosx, docbook-utils
(>= 0.6.14-1), pkgconfig
DescPackaging: <<
Uses pkgconfig.
@@ -11,19 +11,20 @@
Originally packaged by Masanori Sekino.
<<
Source: mirror:gnome:sources/%n/0.2/%n-%v.tar.bz2
-Source-MD5: 1c48c100b450d617b58dacb59837d34f
+Source-MD5: 8d9aad3d94d15e0d59ba9dc0ea990c6c
PatchFile: %n.patch
-PatchFile-MD5: 7bc75a7749fd4bd8a42dccaf851dc871
+PatchFile-MD5: 25412de2a1d9b336691adc54b8b35a92
PatchScript: <<
%{default_script}
perl -pi -e 's/(SOUND_LIBS="-Wl,-framework) -Wl,(CoreAudio")/$1,$2/'
configure
+ perl -pi -e
's|http://www.oasis-open.org/docbook/xml|%p/share/xml/dtd/docbookx|'
docs/esound.sgml
<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -pipe
-ConfigureParams: --mandir=%p/share/man --with-libwrap
--disable-dependency-tracking
+ConfigureParams: --mandir=%p/share/man --htmldir=%p/share/doc/esound/html
--with-libwrap --disable-dependency-tracking
CompileScript: <<
./configure %c
make -j2 EGREP='grep -E' max_cmd_len=1024
@@ -32,7 +33,7 @@
SplitOff: <<
Package: %N-shlibs
Depends: %N-common (>= %v-%r), audiofile-shlibs (>= 0.2.4-1)
- Replaces: %N (<< 0.2.23-2)
+ Replaces: %N (<< 0.2.38-1)
Files: lib/libesd.*.dylib
Shlibs: %p/lib/libesd.0.dylib 3.0.0 %n (>= 0.2.28-1)
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TIPS TODO
@@ -40,18 +41,18 @@
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (>= %v-%r)
- Replaces: %N (<< 0.2.27-1)
+ Replaces: %N (<< 0.2.38-1)
Files: <<
bin/esd bin/esdcat bin/esdctl bin/esdfilt bin/esdloop
bin/esdmon bin/esdplay bin/esdrec bin/esdsample
- share/man/man1 share/doc/%N/html
+ share/man/man1
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TIPS TODO
<<
SplitOff3: <<
Package: %N-common
Provides: %N-data
- Replaces: %N (<< 0.2.23-2), %N-data
+ Replaces: %N (<< 0.2.38-1), %N-data
Conflicts: %N-data
Files: etc
ConfFiles: %p/etc/esd.conf
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
