Cope with libgpod update, and update my email address
ok sturm
This commit is contained in:
ckuethe
parent
70f76af789
commit
4acedbe60e
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2007/01/04 20:19:53 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2007/03/17 21:55:40 ckuethe Exp $
|
||||
|
||||
COMMENT= "GTK+2 program to synchronize an Apple iPod"
|
||||
DISTNAME= gtkpod-0.99.8
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
CATEGORIES= audio x11
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
|
||||
|
||||
HOMEPAGE= http://www.gtkpod.org/
|
||||
|
||||
MAINTAINER= Chris Kuethe <ckuethe@ualberta.ca>
|
||||
MAINTAINER= Chris Kuethe <ckuethe@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
USE_X11= Yes
|
||||
|
||||
LIB_DEPENDS= id3tag.>=2::audio/libid3tag \
|
||||
gpod.>=400.0::audio/libgpod \
|
||||
gpod.>=402.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
|
||||
|
||||
70
audio/gtkpod/patches/patch-src_file_c
Normal file
70
audio/gtkpod/patches/patch-src_file_c
Normal file
@ -0,0 +1,70 @@
|
||||
$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;
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_file_itunesdb_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $
|
||||
--- src/file_itunesdb.c.orig Tue Oct 3 11:45:05 2006
|
||||
+++ src/file_itunesdb.c Tue Oct 3 11:48:46 2006
|
||||
$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_
|
||||
gp_itdb_add_extra_full (itdb);
|
||||
|
||||
@ -22,6 +22,19 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $
|
||||
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_
|
||||
while (extendeddeletion)
|
||||
{
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
$OpenBSD: patch-src_mp4file_h,v 1.2 2006/01/20 06:27:28 jolan Exp $
|
||||
--- src/mp4file.h.orig Fri Jun 17 07:30:05 2005
|
||||
+++ src/mp4file.h Fri Jan 6 15:45:20 2006
|
||||
@@ -35,3 +35,5 @@
|
||||
$OpenBSD: patch-src_mp4file_h,v 1.3 2007/03/17 21:55:40 ckuethe Exp $
|
||||
--- src/mp4file.h.orig Thu Jun 22 08:24:35 2006
|
||||
+++ src/mp4file.h Thu Mar 15 08:42:22 2007
|
||||
@@ -35,4 +35,6 @@
|
||||
gboolean mp4_write_file_info (gchar *filename, Track *track);
|
||||
Track *mp4_get_file_info (gchar *name);
|
||||
#endif
|
||||
gboolean mp4_read_soundcheck (gchar *filename, Track *track);
|
||||
+
|
||||
+#define HAVE_GLIB_H 1
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user