Update to 0.6.0:

Overview of changes in libgpod 0.6.0
====================================

* support for iPod Classics and Video Nanos

The database from these models is protected by a checksum. When this checksum
doesn't match the content of the iPod database, the iPod won't show any
track (ie it will look empty). Support for writing this checksum has been
implemented in this release thanks to the awesome work of a few people in
#gtkpod. However, to calculate this checksum, a so called "firewire ID" is
needed which is different from iPod to iPod. Since reading it from the iPod
requires special permissions, the firewire ID must be written in a regular
file on the iPod so that libgpod can find it and use it to generate the
checksum.

libgpod installs a HAL callout to do that automatically when
everything is installed in an appropriate place. It can also be done manually,
see README.SysInfo for more information.

Cover art should be working except for non square covers, preliminary photo
support but this hasn't been widely tested yet.


* support for iPhone and iPod Touch

This requires manual user intervention: the devices must be jailbroken and
mounted through sshfs. The iPod Touch also needs a firewire ID which must be
manually set, see README.SysInfo

Cover art is implemented but not tested at all, ditto for photo support on
the iPod Touch


* additional tools to get the firewire id from new iPods including a HAL
  callout which will make the process totally automatic when it's properly
  installed. These tools need libsgutils to be installed.

* endianness fixes in the artwork writing code
* now depends on glib 2.8 or newer

Huge thanks to wtbw and Simon Schulz without whom that release wouldn't have
been possible. Thanks as well to the people on #gtkpod for the testing they
provided.

Other contributors to the release:
- Jesse Bouwman
- Alex Eftimie
- Christophe Fergeau
- Filippo Giunchedi
- Javier Kohen
- Tobias Kreisel
- Eric Lassauge
- Nicholas Piper
- Jorg Schuler
- Simon Schulz
- Todd Zullinger

5 files changed, 25 insertions, 34 deletions

diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 7c8c2954f51..502133e7349 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/02/07 22:30:10 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2007/11/29 18:47:27 wiz Exp $
 
-DISTNAME=		libgpod-0.4.2
+DISTNAME=		libgpod-0.6.0
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
@@ -13,6 +13,7 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/libgpod/PLIST b/audio/libgpod/PLIST
index 3ac46179285..bc15f075665 100644
--- a/audio/libgpod/PLIST
+++ b/audio/libgpod/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/02/07 22:30:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/11/29 18:47:28 wiz Exp $
 include/gpod-1.0/gpod/itdb.h
 lib/libgpod.la
 lib/pkgconfig/libgpod-1.0.pc
@@ -30,6 +30,7 @@ share/locale/fr/LC_MESSAGES/libgpod.mo
 share/locale/he/LC_MESSAGES/libgpod.mo
 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
 @dirrm share/gtk-doc/html/libgpod
 @dirrm include/gpod-1.0/gpod
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
index 74a9ff0dde7..f4b11033f50 100644
--- a/audio/libgpod/distinfo
+++ b/audio/libgpod/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/07/23 23:58:35 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/11/29 18:47:28 wiz Exp $
 
-SHA1 (libgpod-0.4.2.tar.gz) = b2aece62a206a5b703c50e6625b173217f1d67a6
-RMD160 (libgpod-0.4.2.tar.gz) = 5f69a0455412771e7bc33e9f4c1996454da9792e
-Size (libgpod-0.4.2.tar.gz) = 768720 bytes
-SHA1 (patch-aa) = 10c09bf41c73667a93667d13f2e2a83478e680f5
-SHA1 (patch-ab) = e405427a69ae2257bd509fa9261eb3571eeb138d
+SHA1 (libgpod-0.6.0.tar.gz) = 09b660324785cec122b5df62f1825ebd595c4ecc
+RMD160 (libgpod-0.6.0.tar.gz) = 684ea4276cd2c1fbe4c415a8ac931d8777e8c2fb
+Size (libgpod-0.6.0.tar.gz) = 843097 bytes
+SHA1 (patch-aa) = 1b9bc0a84875d7aaf52a6e49ce9024fa4096250c
diff --git a/audio/libgpod/patches/patch-aa b/audio/libgpod/patches/patch-aa
index 74f87ec711f..7ebe5114763 100644
--- a/audio/libgpod/patches/patch-aa
+++ b/audio/libgpod/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2007/02/07 22:30:11 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2007/11/29 18:47:28 wiz Exp $
 
---- configure.orig	2007-01-15 16:46:04.000000000 +0100
+--- configure.orig	2007-11-10 11:16:17.000000000 +0000
 +++ configure
-@@ -21991,7 +21991,7 @@ echo $ECHO_N "checking whether to build 
+@@ -20379,7 +20379,7 @@ echo "$as_me: error: HAL support explici
+    { (exit 1); exit 1; }; }
+   fi
+ 
+-  if test "x$enable_hal" == "xyes"; then
++  if test "x$enable_hal" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL 1
+@@ -22370,7 +22370,7 @@ echo $ECHO_N "checking whether to build 
      { echo "$as_me:$LINENO: result: $with_python" >&5
  echo "${ECHO_T}$with_python" >&6; }
  
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2007/02/07 22:30:11 drochner Exp $
          if test -z "$PYTHON"; then
              # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
-@@ -22274,7 +22274,7 @@ rm -f conftest.err conftest.$ac_ext
+@@ -22653,7 +22653,7 @@ rm -f conftest.err conftest.$ac_ext
  CPPFLAGS="$save_CPPFLAGS"
  
  
@@ -20,8 +29,8 @@ $NetBSD: patch-aa,v 1.2 2007/02/07 22:30:11 drochner Exp $
                                                  if test `uname` = Darwin; then
                      PYTHON_LDFLAGS="-Wl,-F. -Wl,-F. -bundle"
                      if $PYTHON -c 'import sys, string; sys.exit(string.find(sys.prefix,"Framework")+1)'; then
-@@ -22330,7 +22330,7 @@ echo "${ECHO_T}no" >&6; }
- fi
+@@ -22713,7 +22713,7 @@ fi
+ 
  
  
 -                                if test "X$with_python" == Xyes; then
diff --git a/audio/libgpod/patches/patch-ab b/audio/libgpod/patches/patch-ab
deleted file mode 100644
index 88e03219a93..00000000000
--- a/audio/libgpod/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/07/23 23:58:35 wiz Exp $
-
---- src/db-artwork-writer.c.orig	2006-11-11 11:40:45.000000000 +0000
-+++ src/db-artwork-writer.c
-@@ -118,9 +118,13 @@ ipod_buffer_grow_mapping (iPodBuffer *bu
- {
- 	void *new_address;
- #ifdef HAVE_MREMAP
--	
-+#if defined(__NetBSD__)
-+	new_address = mremap (buffer->mmap->mmap_area, buffer->mmap->size,
-+			      buffer->mmap->mmap_area, buffer->mmap->size + size, 0);
-+#else
- 	new_address = mremap (buffer->mmap->mmap_area, buffer->mmap->size,
- 			      buffer->mmap->size + size, 0);
-+#endif
- #else
- 	munmap (buffer->mmap->mmap_area, buffer->mmap->size);
- 	new_address = mmap (buffer->mmap->mmap_area, buffer->mmap->size + size,