Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18232/libs
Modified Files:
libgpod0.info
Added Files:
libgpod1.info libgpod1.patch
Log Message:
amarok 1.4.5 + libgpod1 0.4.2
--- NEW FILE: libgpod1.info ---
Package: libgpod1
Version: 0.4.2
Revision: 1
Depends: %N-shlibs (>= %v-%r)
BuildDepends: atk1 (>= 1.6.0-1), glib2-dev (>= 2.6.6-1), gtk+2-dev, intltool
(>= 0.33-1), libgettext3-dev, libiconv, pango1-xft2-dev (>= 1.8.0-1), pkgconfig
Conflicts: libgpod0
Replaces: libgpod0
Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
Source-MD5: c3c031dc6f1f6eff422598c84f2621bd
Patch: %n.patch
PatchScript: perl -pi -e
's,GETTEXT_PACKAGE=libgpod,GETTEXT_PACKAGE=libgpod-1.0,' configure
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
InstallScript: make -j1 install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Description: Shared libraries for libgpod
Depends: glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv
Files: lib/libgpod.*.dylib share/locale
Shlibs: %p/lib/libgpod.1.dylib 303.0.0 libgpod1-shlibs (>= 0.4.2-1)
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
Description: Library for accessing iPod files
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.gtkpod.org/libgpod.html
License: LGPL
DescDetail: <<
libgpod is a shared library to access the contents of an
iPod. This library is based on code used in the gtkpod
project.
libgpod supports playlists, smart playlists, playcounts,
ratings and podcasts. Support for cover art and photos is
currently being tested.
<<
Index: libgpod0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgpod0.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgpod0.info 15 Nov 2006 13:35:43 -0000 1.3
+++ libgpod0.info 6 Feb 2007 14:31:53 -0000 1.4
@@ -1,24 +1,23 @@
Package: libgpod0
Version: 0.3.2
-Revision: 2
+Revision: 3
Depends: %N-shlibs (>= %v-%r)
BuildDepends: atk1 (>= 1.6.0-1), glib2-dev (>= 2.6.6-1), gtk+2-dev, intltool
(>= 0.33-1), libgettext3-dev, libiconv, pango1-xft2-dev (>= 1.8.0-1), pkgconfig
+Conflicts: libgpod1
+Replaces: libgpod1
Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
Source-MD5: c9c41625347a33efd9441c4e71fdd04e
Patch: %n.patch
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
-InstallScript: <<
-#!/bin/sh -ex
-
- make install DESTDIR=%d
-<<
+InstallScript: make install DESTDIR=%d
SplitOff: <<
- Package: %N-shlibs
- Description: Shared libraries for libgpod
- Depends: glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv
- Files: lib/libgpod.*.dylib
- Shlibs: %p/lib/libgpod.0.dylib 303.0.0 libgpod0-shlibs (>= 0.3.2-1)
+ Package: %N-shlibs
+ Description: Shared libraries for libgpod
+ Depends: glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv
+ Replaces: libgpod0 (<< 0.3.2-3)
+ Files: lib/libgpod.*.dylib share/local
+ Shlibs: %p/lib/libgpod.0.dylib 303.0.0 libgpod0-shlibs (>= 0.3.2-1)
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
--- NEW FILE: libgpod1.patch ---
diff -uNr libgpod-0.4.2/src/db-parse-context.c
libgpod-0.4.2-new/src/db-parse-context.c
--- libgpod-0.4.2/src/db-parse-context.c 2006-10-02 09:52:47.000000000
-0400
+++ libgpod-0.4.2-new/src/db-parse-context.c 2007-02-05 22:15:47.000000000
-0500
@@ -23,9 +23,9 @@
*/
+#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
diff -uNr libgpod-0.4.2/src/itdb_itunesdb.c
libgpod-0.4.2-new/src/itdb_itunesdb.c
--- libgpod-0.4.2/src/itdb_itunesdb.c 2007-01-14 09:28:37.000000000 -0500
+++ libgpod-0.4.2-new/src/itdb_itunesdb.c 2007-02-05 22:18:28.000000000
-0500
@@ -4638,6 +4638,18 @@
}
+ gboolean haystack (gchar *filetype, gchar **desclist)
+ {
+ gchar **dlp;
+ if (!filetype || !desclist) return FALSE;
+ for (dlp=desclist; *dlp; ++dlp)
+ {
+ if (strstr (filetype, *dlp)) return TRUE;
+ }
+ return FALSE;
+}
+
+
/**
* itdb_shuffle_write_file:
* @itdb: the #Itdb_iTunesDB to write to disk
@@ -4652,18 +4664,6 @@
gboolean itdb_shuffle_write_file (Itdb_iTunesDB *itdb,
const gchar *filename, GError **error)
{
- auto gboolean haystack (gchar *filetype, gchar **desclist);
- gboolean haystack (gchar *filetype, gchar **desclist)
- {
- gchar **dlp;
- if (!filetype || !desclist) return FALSE;
- for (dlp=desclist; *dlp; ++dlp)
- {
- if (strstr (filetype, *dlp)) return TRUE;
- }
- return FALSE;
- }
-
FExport *fexp;
GList *gl;
WContents *cts;
diff -uNr libgpod-0.4.2/src/itdb_track.c libgpod-0.4.2-new/src/itdb_track.c
--- libgpod-0.4.2/src/itdb_track.c 2007-01-14 10:15:50.000000000 -0500
+++ libgpod-0.4.2-new/src/itdb_track.c 2007-02-05 22:15:47.000000000 -0500
@@ -69,20 +69,11 @@
return track;
}
+extern gboolean haystack (gchar *filetype, gchar **desclist);
+
/* Attempt to set some of the unknowns to reasonable defaults */
static void itdb_track_set_defaults (Itdb_Track *tr)
{
- auto gboolean haystack (gchar *filetype, gchar **desclist);
- gboolean haystack (gchar *filetype, gchar **desclist)
- {
- gchar **dlp;
- if (!filetype || !desclist) return FALSE;
- for (dlp=desclist; *dlp; ++dlp)
- {
- if (strstr (filetype, *dlp)) return TRUE;
- }
- return FALSE;
- }
gchar *mp3_desc[] = {"MPEG", "MP3", "mpeg", "mp3", NULL};
gchar *mp4_desc[] = {"AAC", "MP4", "aac", "mp4", NULL};
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
