From ededcc9e4d1a5fd31d9d1d679a0c7a08ba2a0e6d Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 29 Dec 2010 17:00:45 -0600
Subject: [PATCH] audio/gtkpod: Uncompressed the patch

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 audio/gtkpod/MP4SetMetadata.diff    | 117 ++++++++++++++++++++++++++++
 audio/gtkpod/MP4SetMetadata.diff.gz | Bin 967 -> 0 bytes
 audio/gtkpod/gtkpod.SlackBuild      |   2 +-
 3 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 audio/gtkpod/MP4SetMetadata.diff
 delete mode 100644 audio/gtkpod/MP4SetMetadata.diff.gz

diff --git a/audio/gtkpod/MP4SetMetadata.diff b/audio/gtkpod/MP4SetMetadata.diff
new file mode 100644
index 0000000000..6f01a50d9d
--- /dev/null
+++ b/audio/gtkpod/MP4SetMetadata.diff
@@ -0,0 +1,117 @@
+diff -ur gtkpod-0.99.14.orig/src/mp4file.c gtkpod-0.99.14/src/mp4file.c
+--- gtkpod-0.99.14.orig/src/mp4file.c	2009-01-17 23:52:32.000000000 -0600
++++ gtkpod-0.99.14/src/mp4file.c	2010-03-16 22:12:08.719427169 -0500
+@@ -399,11 +399,7 @@
+ #else
+ #warning "Album Artist field not supported with this version of libmp4v2. Album Artist support requires at least V1.6.0"
+ #endif
+-#if HAVE_LIBMP4V2_2
+-		    if (MP4GetMetadataComposer(mp4File, &value) && value != NULL)
+-#else
+ 		    if (MP4GetMetadataWriter(mp4File, &value) && value != NULL)
+-#endif
+ 		    {
+ 			track->composer = charset_to_utf8 (value);
+ 			g_free(value);
+@@ -413,11 +409,7 @@
+ 			track->comment = charset_to_utf8 (value);
+ 			g_free(value);
+ 		    }
+-#if HAVE_LIBMP4V2_2
+-		    if (MP4GetMetadataReleaseDate(mp4File, &value) && value != NULL)
+-#else
+ 		    if (MP4GetMetadataYear(mp4File, &value) && value != NULL)
+-#endif
+ 		    {
+ 			track->year = atoi (value);
+ 			g_free(value);
+@@ -447,11 +439,7 @@
+ 			track->genre = charset_to_utf8 (value);
+ 			g_free(value);
+ 		    }
+-#if HAVE_LIBMP4V2_2
+-		    if (MP4GetMetadataBPM (mp4File, &numvalue))
+-#else
+ 		    if (MP4GetMetadataTempo (mp4File, &numvalue))
+-#endif
+ 		    {
+ 			track->BPM = numvalue;
+ 		    }
+@@ -541,29 +529,16 @@
+ 						      &m_track, &m_tracks);
+ 	    gboolean has_disk = MP4GetMetadataDisk (mp4File,
+ 	    &m_disk, &m_disks);*/
+-#if HAVE_LIBMP4V2_2
+-	    gboolean has_tempo = MP4GetMetadataBPM (mp4File,
+-						      &m_tempo);
+-#else
+ 	    gboolean has_tempo = MP4GetMetadataTempo (mp4File,
+ 						      &m_tempo);
+-#endif
+ 	    gboolean has_compilation = MP4GetMetadataCompilation (mp4File,
+ 								  &m_cpl);
+ /*	    MP4GetMetadataName (mp4File, &m_name);
+ 	    MP4GetMetadataArtist (mp4File, &m_artist);
+ 	    MP4GetMetadataAlbumArtist (mp4File, &m_albumartist);
+-#if HAVE_LIBMP4V2_2
+-	    MP4GetMetadataComposer (mp4File, &m_writer);
+-#else
+ 	    MP4GetMetadataWriter (mp4File, &m_writer);
+-#endif
+ 	    MP4GetMetadataComment (mp4File, &m_comment);
+-#if HAVE_LIBMP4V2_2
+-	    MP4GetMetadataReleaseDate (mp4File, &m_year);
+-#else
+ 	    MP4GetMetadataYear (mp4File, &m_year);
+-#endif
+ 	    MP4GetMetadataAlbum (mp4File, &m_album);
+ 	    MP4GetMetadataGenre (mp4File, &m_genre);*/
+ 	    MP4GetMetadataTool (mp4File, &m_tool);
+@@ -584,11 +559,7 @@
+ 	    g_free (value);
+ #endif
+ 	    value = charset_from_utf8 (track->composer);
+-#if HAVE_LIBMP4V2_2
+-	    MP4SetMetadataComposer (mp4File, value);
+-#else
+ 	    MP4SetMetadataWriter (mp4File, value);
+-#endif
+ 	    g_free (value);
+ 
+ 	    value = charset_from_utf8 (track->comment);
+@@ -596,11 +567,7 @@
+ 	    g_free (value);
+ 
+ 	    value = g_strdup_printf ("%d", track->year);
+-#if HAVE_LIBMP4V2_2
+-	    MP4SetMetadataReleaseDate (mp4File, value);
+-#else
+ 	    MP4SetMetadataYear (mp4File, value);
+-#endif
+ 	    g_free (value);
+ 
+ 	    value = charset_from_utf8 (track->album);
+@@ -611,11 +578,7 @@
+ 
+ 	    MP4SetMetadataDisk (mp4File, track->cd_nr, track->cds);
+ 
+-#if HAVE_LIBMP4V2_2
+-	    MP4SetMetadataBPM (mp4File, track->BPM);
+-#else
+ 	    MP4SetMetadataTempo (mp4File, track->BPM);
+-#endif
+ 
+ 	    value = charset_from_utf8 (track->grouping);
+ 	    MP4SetMetadataGrouping (mp4File, value);
+@@ -626,11 +589,7 @@
+ 	    g_free (value);
+ 
+ #if MP4V2_HAS_METADATA_BUG
+-#if HAVE_LIBMP4V2_2
+-	    if (has_tempo) MP4SetMetadataBPM (mp4File, m_tempo);
+-#else
+ 	    if (has_tempo) MP4SetMetadataTempo (mp4File, m_tempo);
+-#endif
+ 	    if (has_compilation) MP4SetMetadataCompilation (mp4File, m_cpl);
+ 	    if (m_tool)     MP4SetMetadataTool (mp4File, m_tool);
+ 	    if (m_covert)   MP4SetMetadataCoverArt (mp4File, m_covert, m_size);
diff --git a/audio/gtkpod/MP4SetMetadata.diff.gz b/audio/gtkpod/MP4SetMetadata.diff.gz
deleted file mode 100644
index 94b0fc2b45f2d52949d026fca03384769c959f3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmV;&133I2iwFR%NT5pq1HD(<PTN2beNMh&N>v0+Y;4E5n2L&UDXj!mRW4PZEEBK8
z3g5b3gW9V9-re;DuVb4;Ma@f=-I+79XJ*d?7keHkDS;)uk0V#nRLfFzQ;i5-?j>Zg
z7sRHAeWWgG7V=?VQIzK)dWNQ1il!_26pYdS*w`N#s#bhJ(I%SK9}EVap%{p+DcVTU
zCtw)+y0Nd#)TwTn##EnJ3}nne4i7;YS=Lb3VZgtqaCq2<*T_#0`+9Uph{Gjp&HdXn
zfH|Q!q2OWUyAVbck~EGZLXiuPnBD=s!wEbflHe$W$O9kWvTPm<6(s-M3kdp=VuBKI
zDEP=>CpWq}QME0eK<Hwxue`<{e4O8$+UK8+F20yIhHdnfUJuxZo$Ro!Gej>CbzFx!
z$59YR2_icz=m$o@5Vjv2KSjH+y$xaouMXhz_4)ZOL(Z<)hV_kLx;B!?HHZ4m7d=Xx
z#l7-=k!J)4u()$bf~ZX+JEh(Xb~3<s!hC6a1fg<^7sb>^q9~?T6h(p!P)IjK%@h2y
zA*){zuMIkJD0&HEza!_LY5mDC*ySA>;pcfYrx}l<RUVfpB<TOJc=Y80D%TFvAOn1!
zuq(uRsNJ`fBp&eq3gb%RoRzVu4-E?jV}m{YNkL05GXdBRY=JT?SBbbfKU>~L5$lK$
z?wrJSadOY1$QhsT%`)NKjRA4vVX<I<Z}-|rT!}*k3H3k{shoTH2Hc0GT@t(|YK`z!
zW}a|!@>hWQyT`smxenIhk1J;@L3kJzViEhC@4dGITK50!1gP2$fgQ4)vOKbJuDFu9
zBlg-HxKKBG@q^N}qi)TbEQ37?b*<N?NrBt_D%`Jx6zV8>=90Nd>J{OWvAFzn=gvj0
z&8Ic*Y(}n<-cqSEAzqTX&@=I_njEfJgUa@l?c_2!o|!@>$Kz5aMOO>)s|cc$e<s;a
z`stA<$Q86U0H5Xkva@B1@O8>BJKCk<Q+=lO3vF_hyn_T^)+FO=GVSE62EViuO58NI
zV}e7<w0`T2yETN$T-$`H<_=whtXhA*G*w00a-t@>o)I;j<wP}RB+rb3kcDf9r1F=T
zLhJJ*58bD^*iBA-;MV;ziq<A$Nuo4nKccJ8xDxFwKW-?8pwGzrY}WlQ*~?_4WMq7t
zU)mR^SM!tk)!aV1KI<Zk|K2D^;ch2?Efcj9q0VL7^ejLsgR>6RI5(l3l_g9rYtT?w
pSpZA@tNJb?_WujrZ4f24&*q{WS{U<Hf`9Qc`~^bH+`A<X000`w-3$N#

diff --git a/audio/gtkpod/gtkpod.SlackBuild b/audio/gtkpod/gtkpod.SlackBuild
index bb9cb1d84b..98674be9a3 100644
--- a/audio/gtkpod/gtkpod.SlackBuild
+++ b/audio/gtkpod/gtkpod.SlackBuild
@@ -68,7 +68,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-zcat $CWD/MP4SetMetadata.diff.gz | patch -p1 || exit 1
+patch -p1 < $CWD/MP4SetMetadata.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \