Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9350
Modified Files:
libcanberra0.info libcanberra0.patch
Log Message:
new version
Index: libcanberra0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libcanberra0.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libcanberra0.info 5 Oct 2008 14:18:54 -0000 1.4
+++ libcanberra0.info 4 Nov 2008 06:34:29 -0000 1.5
@@ -1,14 +1,16 @@
Package: libcanberra0
-Version: 0.9
+Version: 0.10
Revision: 1
Source: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%v.tar.gz
-Source-MD5: 1c6c63d5461e6a1ae443a124d49f8fb6
+Source-MD5: 2623370bfcecaeecaeb85e5ec445f340
PatchFile: %n.patch
-Patchfile-MD5: b006b33b018ecfa1e5574a924a515a94
+Patchfile-MD5: 15e727eb10de4c3653565e64e1b9d9dd
BuildDepends: <<
+ autoconf,
+ automake1.10,
fink (>= 0.24.12-1),
- gtk-doc (>= 1.8-1),
+ gtk-doc (>= 1.9-1),
libogg,
libiconv-dev,
libtool2,
@@ -19,7 +21,12 @@
BuildDependsOnly: true
-ConfigureParams: --disable-dependency-tracking --disable-gtk --disable-lynx
--disable-tdb --disable-gstreamer
+ConfigureParams: --disable-dependency-tracking --disable-static --disable-gtk
--disable-lynx --disable-tdb --disable-gstreamer
+CompileScript: <<
+ autoreconf -fi
+ ./configure %c
+ make
+<<
InstallScript: make install DESTDIR=%d
DocFiles: LGPL README
@@ -37,9 +44,11 @@
<<
DescPort: <<
- Clean up some compiler warnings. See:
-
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-October/000116.html
-
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-October/000117.html
+ Scrap superfluous iconv tests. See:
+
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-November/000133.html
+
+ Scrap gconf tests if not doing gtk stuff. See:
+
https://tango.0pointer.de/pipermail/libcanberra-discuss/2008-November/000134.html
<<
DescPackaging: <<
Core lib doesn't use gtk and the gtk lib's libtool versioning
@@ -47,8 +56,6 @@
Don't bother dragging in lynx just for .html -> .txt for the README
- Checks for libiconv info but doesn't use it. Odd.
-
gstreamer back-end is disabled for now.
tdb not in fink now--disable for consistency if we do get it.
Index: libcanberra0.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libcanberra0.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libcanberra0.patch 5 Oct 2008 14:18:54 -0000 1.4
+++ libcanberra0.patch 4 Nov 2008 06:34:29 -0000 1.5
@@ -1,32 +1,51 @@
-diff -Nurd -x'*~' libcanberra-0.9.orig/src/dso.c libcanberra-0.9/src/dso.c
---- libcanberra-0.9.orig/src/dso.c 2008-08-27 17:47:35.000000000 -0400
-+++ libcanberra-0.9/src/dso.c 2008-10-04 20:48:19.000000000 -0400
-@@ -250,11 +250,11 @@
+diff -Nurd -x'*~' libcanberra-0.10.orig/Makefile.am
libcanberra-0.10/Makefile.am
+--- libcanberra-0.10.orig/Makefile.am 2008-10-05 22:07:43.000000000 -0400
++++ libcanberra-0.10/Makefile.am 2008-11-04 01:25:41.000000000 -0500
+@@ -29,10 +29,10 @@
- if (!(p->driver_open = GET_FUNC_PTR(p->module, driver, "driver_open",
int, (ca_context*))) ||
- !(p->driver_destroy = GET_FUNC_PTR(p->module, driver,
"driver_destroy", int, (ca_context*))) ||
-- !(p->driver_change_device = GET_FUNC_PTR(p->module, driver,
"driver_change_device", int, (ca_context*, const char *device))) ||
-- !(p->driver_change_props = GET_FUNC_PTR(p->module, driver,
"driver_change_props", int, (ca_context *, ca_proplist *changed, ca_proplist
*merged))) ||
-- !(p->driver_play = GET_FUNC_PTR(p->module, driver, "driver_play",
int, (ca_context*, uint32_t id, ca_proplist *p, ca_finish_callback_t cb, void
*userdata))) ||
-- !(p->driver_cancel = GET_FUNC_PTR(p->module, driver, "driver_cancel",
int, (ca_context*, uint32_t id))) ||
-- !(p->driver_cache = GET_FUNC_PTR(p->module, driver, "driver_cache",
int, (ca_context*, ca_proplist *p)))) {
-+ !(p->driver_change_device = GET_FUNC_PTR(p->module, driver,
"driver_change_device", int, (ca_context*, const char *))) ||
-+ !(p->driver_change_props = GET_FUNC_PTR(p->module, driver,
"driver_change_props", int, (ca_context *, ca_proplist *, ca_proplist *))) ||
-+ !(p->driver_play = GET_FUNC_PTR(p->module, driver, "driver_play",
int, (ca_context*, uint32_t, ca_proplist *, ca_finish_callback_t, void *))) ||
-+ !(p->driver_cancel = GET_FUNC_PTR(p->module, driver, "driver_cancel",
int, (ca_context*, uint32_t))) ||
-+ !(p->driver_cache = GET_FUNC_PTR(p->module, driver, "driver_cache",
int, (ca_context*, ca_proplist *)))) {
+ if HAVE_GTK
+ pkgconfig_DATA += libcanberra-gtk.pc
++schemas_DATA = libcanberra.schemas
+ endif
- ca_free(driver);
- driver_destroy(c);
-diff -Nurd -x'*~' libcanberra-0.9.orig/src/read-wav.c
libcanberra-0.9/src/read-wav.c
---- libcanberra-0.9.orig/src/read-wav.c 2008-08-14 13:02:33.000000000
-0400
-+++ libcanberra-0.9/src/read-wav.c 2008-10-04 20:49:06.000000000 -0400
-@@ -60,7 +60,7 @@
- break;
- }
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+-schemas_DATA = libcanberra.schemas
-- if (fseek(w->file, s, SEEK_CUR) < 0)
-+ if (fseek(w->file, (long) s, SEEK_CUR) < 0)
- return CA_ERROR_SYSTEM;
- }
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+diff -Nurd -x'*~' libcanberra-0.10.orig/configure.ac
libcanberra-0.10/configure.ac
+--- libcanberra-0.10.orig/configure.ac 2008-10-05 21:56:57.000000000 -0400
++++ libcanberra-0.10/configure.ac 2008-11-04 01:08:35.000000000 -0500
+@@ -153,7 +153,7 @@
+
+ #### [lib]iconv ####
+-AM_ICONV
++#AM_ICONV
+
+ ###################################
+ # External libraries #
+@@ -339,6 +339,7 @@
+ ],
+ [gtk=auto])
+
++AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+ if test "x${gtk}" != xno ; then
+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.13.4 gthread-2.0 ],
+ [
+@@ -346,6 +347,7 @@
+ AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
+
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
++ AM_GCONF_SOURCE_2
+
+ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ GTK_MODULES_DIR="${libdir}/gtk-2.0/modules"
+@@ -360,7 +362,6 @@
+ HAVE_GTK=0
+ fi
+
+-AM_GCONF_SOURCE_2
+
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
