diff --exclude CVS -urN ./Makefile ../gtkpod.new/Makefile --- ./Makefile Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/Makefile Mon Jul 23 22:08:50 2007 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.20 2007/04/12 20:24:30 sturm Exp $ COMMENT= "GTK+2 program to synchronize an Apple iPod" -DISTNAME= gtkpod-0.99.8 -PKGNAME= ${DISTNAME}p3 +DISTNAME= gtkpod-0.99.10 CATEGORIES= audio x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} @@ -17,9 +16,10 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes +USE_GMAKE= Yes LIB_DEPENDS= id3tag.>=2::audio/libid3tag \ - gpod.>=402.0::audio/libgpod \ + gpod.>=502.0::audio/libgpod \ gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ glade-2.0.>=0.4::devel/libglade2 \ mp4v2::audio/faad diff --exclude CVS -urN ./distinfo ../gtkpod.new/distinfo --- ./distinfo Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/distinfo Mon Jul 23 21:45:29 2007 @@ -1,5 +1,5 @@ -MD5 (gtkpod-0.99.8.tar.gz) = 8EtnYFIE2QdtMNg7creEYw== -RMD160 (gtkpod-0.99.8.tar.gz) = atYwU5PWb3qEzBHkdQRcgTeiDIA= -SHA1 (gtkpod-0.99.8.tar.gz) = AjtVvDzZ77qfx6oBauY1OKmM8c8= -SHA256 (gtkpod-0.99.8.tar.gz) = 90r+/jHesR3CNbHTYd9nMpZv4ro+rd+5YMab8NFh4W0= -SIZE (gtkpod-0.99.8.tar.gz) = 1074007 +MD5 (gtkpod-0.99.10.tar.gz) = y8LQNYWq9BkV4mx8g6rUEg== +RMD160 (gtkpod-0.99.10.tar.gz) = maBqnluMrR48G0iiIClvF5bLqPY= +SHA1 (gtkpod-0.99.10.tar.gz) = NQpRzk6Nrk65wvIkeZBE+qqY8+A= +SHA256 (gtkpod-0.99.10.tar.gz) = zY7CJYqj53TvH3QxF93Ibn2JvD9A/ANJK3sIk/lmns4= +SIZE (gtkpod-0.99.10.tar.gz) = 1068561 diff --exclude CVS -urN ./patches/patch-src_file_c ../gtkpod.new/patches/patch-src_file_c --- ./patches/patch-src_file_c Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/patches/patch-src_file_c Mon Jul 23 21:49:15 2007 @@ -1,70 +0,0 @@ -$OpenBSD: patch-src_file_c,v 1.1 2007/03/17 21:55:40 ckuethe Exp $ ---- src/file.c.orig Thu Mar 15 08:43:16 2007 -+++ src/file.c Thu Mar 15 08:48:50 2007 -@@ -851,7 +851,7 @@ static void copy_new_info (Track *from, - to->time_modified = from->time_modified; - to->year = from->year; - to->compilation = from->compilation; -- to->unk208 = from->unk208; -+ to->mediatype = from->mediatype; - to->lyrics_flag = from->lyrics_flag; - to->movie_flag = from->movie_flag; - } -@@ -1069,25 +1069,25 @@ static Track *get_track_info_from_file ( - { - case FILE_TYPE_MP3: - nti = mp3_get_file_info (name); -- /* Set unk208 to audio */ -- if (nti) nti->unk208 = 0x00000001; -+ /* Set mediatype to audio */ -+ if (nti) nti->mediatype = 0x00000001; - break; - case FILE_TYPE_M4A: - case FILE_TYPE_M4P: - case FILE_TYPE_M4B: - nti = mp4_get_file_info (name); -- /* Set unk208 to audio */ -+ /* Set mediatype to audio */ - if (nti) - { -- nti->unk208 = 0x00000001; -+ nti->mediatype = 0x00000001; - } - break; - case FILE_TYPE_WAV: - nti = wav_get_file_info (name); -- /* Set unk208 to audio */ -+ /* Set mediatype to audio */ - if (nti) - { -- nti->unk208 = 0x00000001; -+ nti->mediatype = 0x00000001; - } - break; - case FILE_TYPE_M4V: -@@ -1096,10 +1096,10 @@ static Track *get_track_info_from_file ( - this. Let's see if someone complains. */ - nti = mp4_get_file_info (name); - if (!nti) video_get_file_info (name); -- /* Set unk208 to video */ -+ /* Set mediatype to video */ - if (nti) - { -- nti->unk208 = 0x00000002; -+ nti->mediatype = 0x00000002; - nti->movie_flag = 0x01; - } - break; -@@ -1107,10 +1107,10 @@ static Track *get_track_info_from_file ( - case FILE_TYPE_MPG: - /* for now treat all the same */ - nti = video_get_file_info (name); -- /* Set unk208 to video */ -+ /* Set mediatype to video */ - if (nti) - { -- nti->unk208 = 0x00000002; -+ nti->mediatype = 0x00000002; - nti->movie_flag = 0x01; - } - break; diff --exclude CVS -urN ./patches/patch-src_file_convert_c ../gtkpod.new/patches/patch-src_file_convert_c --- ./patches/patch-src_file_convert_c Wed Dec 31 17:00:00 1969 +++ ../gtkpod.new/patches/patch-src_file_convert_c Mon Jul 23 22:08:04 2007 @@ -0,0 +1,60 @@ +$OpenBSD$ +--- src/file_convert.c.orig Mon Jul 23 21:55:51 2007 ++++ src/file_convert.c Mon Jul 23 22:07:27 2007 +@@ -215,8 +215,8 @@ struct _ConvTrack + gchar *errormessage; /* error message if any */ + gchar *fname_root; /* filename root of converted file */ + gchar *fname_extension; /* filename extension of converted file */ +- GPid pid; /* PID of child doing the conversion */ +- gint stderr; /* stderr of child doing the conversion */ ++ gint pid; /* PID of child doing the conversion */ ++ gint Stderr; /* stderr of child doing the conversion */ + Track *track; /* for reference, don't access inside threads! */ + iTunesDB *itdb; /* for reference, don't access inside threads! */ + gint threadnum; /* number of thread working on this track */ +@@ -645,6 +645,7 @@ static void conversion_prefs_changed (Conversion *conv + } + + conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM); ++#ifdef _SC_NPROCESSORS_ONLN + if (conv->max_threads_num == 0) + { /* set to maximum available number of processors */ + conv->max_threads_num = sysconf (_SC_NPROCESSORS_ONLN); +@@ -654,6 +655,10 @@ static void conversion_prefs_changed (Conversion *conv + conv->max_threads_num = 1; + } + } ++#else ++ /* the biggest openbsd box i've seen has 8 cpus/cores */ ++ conv->max_threads_num = 8; ++#endif + + g_free (conv->template); + conv->template = prefs_get_string (FILE_CONVERT_TEMPLATE); +@@ -2271,7 +2276,7 @@ static gboolean conversion_convert_track (Conversion * + { /* start conversion */ + gchar **argv; + GError *error = NULL; +- GPid child_pid; ++ gint child_pid; + + argv = build_argv_from_strings (ctr->conversion_cmd, + "-a", ctr->artist, +@@ -2296,7 +2301,7 @@ static gboolean conversion_convert_track (Conversion * + &ctr->pid, /* child's PID */ + NULL, /* child's stdin */ + NULL, /* child's stdout */ +- &ctr->stderr, /* child's stderr */ ++ &ctr->Stderr, /* child's stderr */ + &error); + + child_pid = ctr->pid; +@@ -2322,7 +2327,7 @@ static gboolean conversion_convert_track (Conversion * + gint status; + + /* set up i/o channel to main thread */ +- ctr->gio_channel = g_io_channel_unix_new (ctr->stderr); ++ ctr->gio_channel = g_io_channel_unix_new (ctr->Stderr); + g_io_channel_set_flags (ctr->gio_channel, + G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE); diff --exclude CVS -urN ./patches/patch-src_file_itunesdb_c ../gtkpod.new/patches/patch-src_file_itunesdb_c --- ./patches/patch-src_file_itunesdb_c Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/patches/patch-src_file_itunesdb_c Mon Jul 23 21:48:43 2007 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.2 2007/03/17 21:55:40 ckuethe Exp $ ---- src/file_itunesdb.c.orig Sun Jun 25 10:08:22 2006 -+++ src/file_itunesdb.c Thu Mar 15 08:49:17 2007 -@@ -547,7 +547,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ +--- src/file_itunesdb.c.orig Wed Jun 27 13:29:33 2007 ++++ src/file_itunesdb.c Mon Jul 23 21:46:36 2007 +@@ -563,7 +563,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi gp_itdb_add_extra_full (itdb); eitdb = itdb->userdata; @@ -10,9 +10,9 @@ eitdb->offline = offline; -@@ -571,9 +571,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ - { +@@ -588,9 +588,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi Track *track = gl->data; + ExtraTrackData *etr; - g_return_val_if_fail (track, (release_widgets(), NULL)); + g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL)); @@ -22,20 +22,7 @@ fill_in_extended_info (track, total, num); gp_track_validate_entries (track); /* properly set value for has_artwork */ -@@ -589,9 +589,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ - track->has_artwork = 0x02; - } - -- /* set unk208 to audio if unset (important only for iPod Video) */ -- if (track->unk208 == 0) -- track->unk208 = 0x00000001; -+ /* set mediatype to audio if unset (important only for iPod Video) */ -+ if (track->mediatype == 0) -+ track->mediatype = 0x00000001; - /* restore deleted thumbnails */ - if ((track->artwork->thumbnails == NULL) && - (strlen (etr->thumb_path_locale) != 0)) -@@ -609,7 +609,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ +@@ -630,7 +630,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi while (extendeddeletion) { Track *track = extendeddeletion->data; @@ -44,7 +31,7 @@ mark_track_for_deletion (itdb, track); extendeddeletion = g_list_delete_link (extendeddeletion, extendeddeletion); -@@ -632,15 +632,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ +@@ -654,15 +654,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi GHashTable *track_hash = g_hash_table_new (g_direct_hash, g_direct_equal); Playlist *mpl = itdb_playlist_mpl (itdb); @@ -63,7 +50,7 @@ duptr = itdb_track_duplicate (track); /* add to database -- if duplicate detection is on and the same track already exists in the database, the already -@@ -659,15 +659,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ +@@ -681,15 +681,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi GList *glm; Playlist *duppl; Playlist *pl = gl->next->data; /* skip MPL */ @@ -82,7 +69,7 @@ glm->data = newtr; } /* if it's the podcasts list, don't add the list again if -@@ -678,7 +678,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_ +@@ -700,7 +700,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi Playlist *podcasts = itdb_playlist_podcasts (itdb); for (glm=duppl->members; glm; glm=glm->next) { @@ -91,7 +78,7 @@ itdb_playlist_add_track (podcasts, glm->data, -1); } itdb_playlist_free (duppl); -@@ -740,9 +740,9 @@ iTunesDB *gp_merge_itdb (iTunesDB *old_i +@@ -779,9 +779,9 @@ iTunesDB *gp_merge_itdb (iTunesDB *old_itdb) ExtraiTunesDBData *old_eitdb; iTunesDB *new_itdb; diff --exclude CVS -urN ./patches/patch-src_info_c ../gtkpod.new/patches/patch-src_info_c --- ./patches/patch-src_info_c Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/patches/patch-src_info_c Mon Jul 23 21:48:43 2007 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_info_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $ ---- src/info.c.orig Tue Oct 3 12:05:13 2006 -+++ src/info.c Tue Oct 3 12:07:38 2006 -@@ -576,14 +576,17 @@ gboolean ipod_connected (void) +--- src/info.c.orig Wed Jun 27 13:29:33 2007 ++++ src/info.c Mon Jul 23 21:46:18 2007 +@@ -579,14 +579,17 @@ gboolean ipod_connected (void) /* we'll use statvfs to determine free space on the iPod where available, df otherwise */ @@ -22,7 +22,7 @@ int status; g_mutex_lock (space_mutex); -@@ -595,13 +598,13 @@ static void th_space_update (void) +@@ -598,13 +601,13 @@ static void th_space_update (void) } if (mp) { diff --exclude CVS -urN ./pkg/PLIST ../gtkpod.new/pkg/PLIST --- ./pkg/PLIST Mon Jul 23 22:17:46 2007 +++ ../gtkpod.new/pkg/PLIST Mon Jul 23 22:09:16 2007 @@ -1,25 +1,32 @@ @comment $OpenBSD: PLIST,v 1.4 2006/03/18 07:08:21 sturm Exp $ bin/gtkpod +share/applications/ +share/applications/gtkpod.desktop share/gtkpod/ -share/gtkpod/gtkpod.glade -share/gtkpod/gtkpod.gladep -share/gtkpod/pixmaps/ -share/gtkpod/pixmaps/gtkpod-add-dirs.png -share/gtkpod/pixmaps/gtkpod-add-files.png -share/gtkpod/pixmaps/gtkpod-add-playlists.png -share/gtkpod/pixmaps/gtkpod-icon-32.png -share/gtkpod/pixmaps/gtkpod-icon-32x32-2.png -share/gtkpod/pixmaps/gtkpod-icon-32x32.png -share/gtkpod/pixmaps/gtkpod-icon-48.png -share/gtkpod/pixmaps/gtkpod-icon-48x48.png -share/gtkpod/pixmaps/gtkpod-icon-64x64.png -share/gtkpod/pixmaps/gtkpod-logo.png -share/gtkpod/pixmaps/gtkpod-new-playlist.png -share/gtkpod/pixmaps/gtkpod-read.png -share/gtkpod/pixmaps/gtkpod-sync.png -share/gtkpod/pixmaps/gtkpod.glade -share/gtkpod/pixmaps/gtkpod.gladep +share/gtkpod/data/ +share/gtkpod/data/cdshine.png +share/gtkpod/data/cdshine_main.png +share/gtkpod/data/default-cover.png +share/gtkpod/data/gtkpod-add-dirs.png +share/gtkpod/data/gtkpod-add-files.png +share/gtkpod/data/gtkpod-add-playlists.png +share/gtkpod/data/gtkpod-icon-32-2.png +share/gtkpod/data/gtkpod-icon-32.png +share/gtkpod/data/gtkpod-icon-48.png +share/gtkpod/data/gtkpod-logo.png +share/gtkpod/data/gtkpod-new-playlist.png +share/gtkpod/data/gtkpod-read.png +share/gtkpod/data/gtkpod-sync.png +share/gtkpod/data/gtkpod.glade share/gtkpod/scripts/ +share/gtkpod/scripts/convert-flac2m4a.sh +share/gtkpod/scripts/convert-flac2mp3.sh +share/gtkpod/scripts/convert-m4a2mp3.sh +share/gtkpod/scripts/convert-mp32m4a.sh +share/gtkpod/scripts/convert-ogg2m4a.sh +share/gtkpod/scripts/convert-ogg2mp3.sh +share/gtkpod/scripts/convert-wav2m4a.sh +share/gtkpod/scripts/convert-wav2mp3.sh share/gtkpod/scripts/ldif2vcf.sh share/gtkpod/scripts/mab2vcard share/gtkpod/scripts/sync-abook.sh @@ -31,11 +38,26 @@ share/gtkpod/scripts/sync-ldif.sh share/gtkpod/scripts/sync-notes.sh share/gtkpod/scripts/sync-palm-jppy.py +share/gtkpod/scripts/sync-thunderbird-nano.sh share/gtkpod/scripts/sync-thunderbird.sh +share/gtkpod/scripts/sync-tomboy.sh share/gtkpod/scripts/sync-webcalendar.sh +share/icons/ +share/icons/hicolor/ +share/icons/hicolor/32x32/ +share/icons/hicolor/32x32/apps/ +share/icons/hicolor/32x32/apps/gtkpod.png +share/icons/hicolor/48x48/ +share/icons/hicolor/48x48/apps/ +share/icons/hicolor/48x48/apps/gtkpod.png +share/icons/hicolor/64x64/ +share/icons/hicolor/64x64/apps/ +share/icons/hicolor/64x64/apps/gtkpod.png share/locale/de/LC_MESSAGES/gtkpod.mo +share/locale/es/LC_MESSAGES/gtkpod.mo share/locale/fr/LC_MESSAGES/gtkpod.mo share/locale/he/LC_MESSAGES/gtkpod.mo share/locale/it/LC_MESSAGES/gtkpod.mo share/locale/ja/LC_MESSAGES/gtkpod.mo share/locale/sv/LC_MESSAGES/gtkpod.mo +share/nls/pl_PL.ISO_8859-2/