From 34910421c44452aebad1cf02d480137c853cb39a Mon Sep 17 00:00:00 2001 From: ckuethe Date: Fri, 6 Mar 2009 20:42:59 +0000 Subject: [PATCH] yearly update to libgpod --- audio/libgpod/Makefile | 13 ++++---- audio/libgpod/distinfo | 10 +++--- .../patches/patch-src_db-parse-context_c | 14 --------- .../libgpod/patches/patch-src_itdb_itunesdb_c | 29 ----------------- audio/libgpod/patches/patch-tests_Makefile_in | 31 ------------------- audio/libgpod/pkg/PLIST | 4 ++- 6 files changed, 15 insertions(+), 86 deletions(-) delete mode 100644 audio/libgpod/patches/patch-src_db-parse-context_c delete mode 100644 audio/libgpod/patches/patch-src_itdb_itunesdb_c delete mode 100644 audio/libgpod/patches/patch-tests_Makefile_in diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index d4aee4cc218..e273e8edd7a 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2009/01/31 23:05:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2009/03/06 20:42:59 ckuethe Exp $ COMMENT= library to access the contents of an iPod -DISTNAME= libgpod-0.6.0 -PKGNAME= ${DISTNAME}p0 -SHARED_LIBS= gpod 600.0 +DISTNAME= libgpod-0.7.0 +PKGNAME= ${DISTNAME} +SHARED_LIBS= gpod 700.0 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} @@ -24,8 +24,9 @@ MODULES= devel/gettext \ textproc/intltool LIB_DEPENDS= gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \ - gdk_pixbuf-2.0::x11/gtk+2 -WANTLIB= m pcre + gdk_pixbuf-2.0::x11/gtk+2 \ + xml2.>=9::textproc/libxml +WANTLIB= m z pcre CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--disable-hal diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo index 0ea36214b18..d2e2ae28481 100644 --- a/audio/libgpod/distinfo +++ b/audio/libgpod/distinfo @@ -1,5 +1,5 @@ -MD5 (libgpod-0.6.0.tar.gz) = tE2K7j9mEDcLb69hdwxfPA== -RMD160 (libgpod-0.6.0.tar.gz) = aE6kJ2zSwfvkxBWorJMdh3fowvs= -SHA1 (libgpod-0.6.0.tar.gz) = CbZgMkeFzsEitd9i8YJevVlcTsw= -SHA256 (libgpod-0.6.0.tar.gz) = osjJmFiDYdiqpMZio49Q2xZLi0/OTnvEmsRFqayH+A8= -SIZE (libgpod-0.6.0.tar.gz) = 843097 +MD5 (libgpod-0.7.0.tar.gz) = NOumimA35rL+2iD0bR2/uA== +RMD160 (libgpod-0.7.0.tar.gz) = DQsJYSMaold2fhG6HlH07uoB92Q= +SHA1 (libgpod-0.7.0.tar.gz) = yO0m7YGoWs8jC14gZTmbA4rAAEY= +SHA256 (libgpod-0.7.0.tar.gz) = 4Q1DixzaXruTI0+tMdIMj54Jbp3I56SvGqNxs4nrTh4= +SIZE (libgpod-0.7.0.tar.gz) = 949630 diff --git a/audio/libgpod/patches/patch-src_db-parse-context_c b/audio/libgpod/patches/patch-src_db-parse-context_c deleted file mode 100644 index 0580d4fbb5f..00000000000 --- a/audio/libgpod/patches/patch-src_db-parse-context_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_db-parse-context_c,v 1.1.1.1 2006/01/20 06:23:51 jolan Exp $ ---- src/db-parse-context.c.orig Fri Jan 6 13:19:48 2006 -+++ src/db-parse-context.c Fri Jan 6 13:20:05 2006 -@@ -23,9 +23,9 @@ - */ - - -+#include - #include - #include --#include - #include - #include - #include diff --git a/audio/libgpod/patches/patch-src_itdb_itunesdb_c b/audio/libgpod/patches/patch-src_itdb_itunesdb_c deleted file mode 100644 index f15c78ef583..00000000000 --- a/audio/libgpod/patches/patch-src_itdb_itunesdb_c +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_itdb_itunesdb_c,v 1.5 2007/11/22 22:37:33 ckuethe Exp $ ---- src/itdb_itunesdb.c.orig Tue Nov 6 11:55:57 2007 -+++ src/itdb_itunesdb.c Sun Nov 18 00:21:47 2007 -@@ -119,7 +119,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -6729,14 +6728,14 @@ static gboolean itdb_create_directories (Itdb_Device * - dirnum = info->musicdirs; - if (dirnum == 0) - { /* do a guess */ -- struct statvfs stat; -- if (statvfs (mp, &stat) != 0) -+ struct stat sb; -+ if (stat (mp, &sb) != 0) - { /* why should this fail !? */ - dirnum = 20; - } - else - { -- gdouble size = ((gdouble)stat.f_blocks * stat.f_frsize) / 1073741824; -+ gdouble size = ((gdouble)sb.st_blocks * sb.st_size) / 1073741824; - if (size < 20) dirnum = 20; - else dirnum = 50; - } diff --git a/audio/libgpod/patches/patch-tests_Makefile_in b/audio/libgpod/patches/patch-tests_Makefile_in deleted file mode 100644 index 578ac0a69b4..00000000000 --- a/audio/libgpod/patches/patch-tests_Makefile_in +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-tests_Makefile_in,v 1.3 2007/11/22 22:37:33 ckuethe Exp $ ---- tests/Makefile.in.orig Sat Nov 10 04:16:20 2007 -+++ tests/Makefile.in Sun Nov 18 00:23:35 2007 -@@ -105,8 +105,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -o $@ - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -@@ -219,7 +218,7 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ - INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = -L$(top_builddir)/src @LDFLAGS@ - LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@ - LIBGPOD_LIBS = @LIBGPOD_LIBS@ - LIBGPOD_MAJOR_VERSION = @LIBGPOD_MAJOR_VERSION@ -@@ -228,7 +227,7 @@ LIBGPOD_MINOR_VERSION = @LIBGPOD_MINOR_VERSION@ - LIBGPOD_SO_VERSION = @LIBGPOD_SO_VERSION@ - LIBGPOD_VERSION = @LIBGPOD_VERSION@ - LIBOBJS = @LIBOBJS@ --LIBS = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la -+LIBS = $(top_builddir)/src/libgpod.la $(LIBGPOD_LIBS) $(LDFLAGS) - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ diff --git a/audio/libgpod/pkg/PLIST b/audio/libgpod/pkg/PLIST index dc9cf60bd74..e7269d418e5 100644 --- a/audio/libgpod/pkg/PLIST +++ b/audio/libgpod/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2007/11/22 22:37:33 ckuethe Exp $ +@comment $OpenBSD: PLIST,v 1.6 2009/03/06 20:42:59 ckuethe Exp $ %%SHARED%% include/gpod-1.0/ include/gpod-1.0/gpod/ @@ -17,6 +17,7 @@ share/gtk-doc/html/libgpod/index.sgml share/gtk-doc/html/libgpod/itunesdb.html share/gtk-doc/html/libgpod/left.png share/gtk-doc/html/libgpod/libgpod-Artwork.html +share/gtk-doc/html/libgpod/libgpod-Chapter-Data.html share/gtk-doc/html/libgpod/libgpod-Device.html share/gtk-doc/html/libgpod/libgpod-File-handling-functions.html share/gtk-doc/html/libgpod/libgpod-Low-level-functions.html @@ -40,3 +41,4 @@ share/locale/it/LC_MESSAGES/libgpod.mo share/locale/ja/LC_MESSAGES/libgpod.mo share/locale/ro/LC_MESSAGES/libgpod.mo share/locale/sv/LC_MESSAGES/libgpod.mo +share/locale/zh_CN/LC_MESSAGES/libgpod.mo