rpms/gtkpod/F-10 gtkpod-0.99.14-lame-tag-endianess.patch, NONE, 1.1 gtkpod-0.99.14-use-xdg-open.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gtkpod.spec, 1.8, 1.9 sources, 1.4, 1.5 gtkpod-0.99.12-tooltips.patch, 1.1, NONE gtkpod-0.99.12-use-xdg-open.patch, 1.1, NONE

Todd M. Zullinger tmz at fedoraproject.org
Wed May 27 03:19:27 UTC 2009


Author: tmz

Update of /cvs/pkgs/rpms/gtkpod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4291

Modified Files:
	.cvsignore gtkpod.spec sources 
Added Files:
	gtkpod-0.99.14-lame-tag-endianess.patch 
	gtkpod-0.99.14-use-xdg-open.patch 
Removed Files:
	gtkpod-0.99.12-tooltips.patch 
	gtkpod-0.99.12-use-xdg-open.patch 
Log Message:
Update to 0.99.14

- Add GFDL to License tag, for documentation
- Update xdg-open patch so it applies without fuzz
- Drop libgnomecanvas-devel BR, it is not used anymore
- Apply upstream patch to fix lame-tag endianess problem (this prevented gapless
  playback from working correctly)
- Update icon cache handling for current packaging guidelines


gtkpod-0.99.14-lame-tag-endianess.patch:

--- NEW FILE gtkpod-0.99.14-lame-tag-endianess.patch ---
>From ef4ce7f7d914c358fe92bf993b1a45e66ee521ac Mon Sep 17 00:00:00 2001
From: Jorg Schuler <jcsjcs at users.sourceforge.net>
Date: Sat, 31 Jan 2009 09:21:48 +0000
Subject: [PATCH] 	* src/mp3file.c (mp3_read_lame_tag): fix endianess problems on
 	  little endian machines. Fixes "iPod doesn't play gapless"
 	  issue. Thanks for Todd for localizing the problem.

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/gtkpod/trunk@2243 f01d2545-417e-4e96-918e-98f8d0dbbcb6
---
 ChangeLog     |    8 +++++++-
 src/mp3file.c |   35 +++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/mp3file.c b/src/mp3file.c
index a2aa72c..53db7e5 100644
--- a/src/mp3file.c
+++ b/src/mp3file.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2009-01-11 17:52:48 jcs>
+/* Time-stamp: <2009-01-31 18:21:09 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -127,8 +127,8 @@ struct _LameTag
     guint8 vbr_method;
     guint8 lowpass;
     float peak_signal_amplitude;
-    guint16 radio_replay_gain;
-    guint16 audiophile_replay_gain;
+    guchar radio_replay_gain[2];
+    guchar audiophile_replay_gain[2];
     guint8 encoding_flags;
     guint8 ath_type;
     guint8 bitrate;
@@ -2053,8 +2053,8 @@ gboolean mp3_get_track_lame_replaygain (const gchar *path, GainData *gd)
 					gd->peak_signal / 0x800000);*/
 		}
 	} else {
-		float f = *((float *) (void *) (&lt.peak_signal_amplitude)) * 0x800000;
-		gd->peak_signal = (guint32) f;
+		gd->peak_signal = (guint32) (lt.peak_signal_amplitude * 0x800000);
+		gd->peak_signal_set = TRUE;
 		/* I would like to see an example of that. */
 /*		printf("peak_signal (lame floating point): %f. PLEASE report.\n", 
 				(double) gd->peak_signal / 0x800000);*/
@@ -2336,12 +2336,12 @@ gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt)
 {
     MP3Info *mp3i = NULL;
     MP3Header h;
-    int flags;
-    int toskip = 0;
+    guint32 flags, peak_amplitude;
+    gint toskip = 0;
     FILE *file;
-    unsigned char ubuf[LAME_TAG_SIZE];
-    int sideinfo;
-    unsigned char full_info_tag[INFO_TAG_CRC_SIZE];
+    guchar ubuf[LAME_TAG_SIZE];
+    gint sideinfo;
+    guchar full_info_tag[INFO_TAG_CRC_SIZE];
 
     g_return_val_if_fail (path, FALSE);
 
@@ -2390,7 +2390,9 @@ gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt)
 	goto lt_fail;
 
     /* Determine the offset of the LAME tag based on contents of the Xing header */
-    fread (&flags, 4, 1, mp3i->file);
+    fread (ubuf, 4, 1, mp3i->file);
+    flags = (ubuf[0] << 24) | (ubuf[1] << 16) | (ubuf[2] << 8) | ubuf[3];
+
     if (flags & FRAMES_FLAG)
     {				/* frames field is set */
 	toskip += 4;
@@ -2412,7 +2414,9 @@ gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt)
     if (fseek (mp3i->file, toskip, SEEK_CUR) || (fread (ubuf, 1, LAME_TAG_SIZE, mp3i->file) != LAME_TAG_SIZE))
 	goto lt_fail;
     if (strncmp (ubuf, "LAME", 4))
+    {
 	goto lt_fail;
+    }
 
     strncpy(lt->encoder, &ubuf[0x0], 4);
 
@@ -2422,9 +2426,12 @@ gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt)
     lt->vbr_method = (ubuf[0x9] & 0xf);
     lt->lowpass = ubuf[0xa];
 
-    memcpy(&lt->peak_signal_amplitude,&ubuf[0xb],4);
-    memcpy(&lt->radio_replay_gain,&ubuf[0xf],2);
-    memcpy(&lt->audiophile_replay_gain,&ubuf[0x11],2);
+
+    /* convert BE float */
+    peak_amplitude = (ubuf[0xb] << 24) | (ubuf[0xc] << 16) | (ubuf[0xd] << 8) | ubuf[0xe];
+    memcpy(&lt->peak_signal_amplitude, &peak_amplitude, 4);
+    memcpy(&lt->radio_replay_gain, &ubuf[0xf], 2);
+    memcpy(&lt->audiophile_replay_gain, &ubuf[0x11], 2);
 
     lt->encoding_flags = ubuf[0x13] >> 4;
     lt->ath_type = ubuf[0x13] & 0xf;
-- 
1.6.1.2


gtkpod-0.99.14-use-xdg-open.patch:

--- NEW FILE gtkpod-0.99.14-use-xdg-open.patch ---
diff -up gtkpod-0.99.13SVN/src/prefs.c.use-xdg-open gtkpod-0.99.13SVN/src/prefs.c
--- gtkpod-0.99.13SVN/src/prefs.c.use-xdg-open	2008-11-18 18:21:27.000000000 -0500
+++ gtkpod-0.99.13SVN/src/prefs.c	2008-11-18 18:22:06.000000000 -0500
@@ -180,8 +180,8 @@ static void set_default_preferences()
     prefs_set_int("delete_local_file", TRUE);
     prefs_set_int("delete_database", TRUE);
     prefs_set_string("initial_mountpoint", "/mnt/ipod");
-    prefs_set_string ("path_play_now", "xmms %s");
-    prefs_set_string ("path_play_enqueue", "xmms -e %s");
+    prefs_set_string ("path_play_now", "xdg-open %s");
+    prefs_set_string ("path_play_enqueue", "");
     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");
     prefs_set_string ("coverart_display_bg_color", "#000000");
     prefs_set_string ("coverart_display_fg_color", "#FFFFFF");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jun 2008 15:38:45 -0000	1.5
+++ .cvsignore	27 May 2009 03:18:56 -0000	1.6
@@ -1,3 +1,3 @@
 *.rpm
 clog
-gtkpod-0.99.12.tar.gz
+gtkpod-0.99.14.tar.gz


Index: gtkpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-10/gtkpod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gtkpod.spec	19 Jan 2009 03:30:25 -0000	1.8
+++ gtkpod.spec	27 May 2009 03:18:57 -0000	1.9
@@ -1,16 +1,17 @@
 Name:           gtkpod
-Version:        0.99.12
-Release:        4%{?dist}
+Version:        0.99.14
+Release:        1%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+# The help documentation is under GFDL, the rest of the code is GPLv2+
+License:        GPLv2+ and GFDL
 URL:            http://www.gtkpod.org
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/449199
-Patch0:         gtkpod-0.99.12-use-xdg-open.patch
-# https://bugzilla.redhat.com/428940 (upstream patch)
-Patch1:         gtkpod-0.99.12-tooltips.patch
+Patch0:         gtkpod-0.99.14-use-xdg-open.patch
+# Upstream patch, from svn rev 2243
+Patch1:         gtkpod-0.99.14-lame-tag-endianess.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -21,8 +22,7 @@ BuildRequires:  gettext
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  hal-devel
 BuildRequires:  libglade2-devel
-BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libgpod-devel >= 0.6.0
+BuildRequires:  libgpod-devel >= 0.7.0
 BuildRequires:  libid3tag-devel
 BuildRequires:  libmp4v2-devel
 BuildRequires:  libvorbis-devel
@@ -41,7 +41,7 @@ the Mini, Photo, Shuffle, Nano, Video, C
 %prep
 %setup -q
 %patch0 -p1 -b .use-xdg-open
-%patch1 -p1 -b .tooltips
+%patch1 -p1 -b .endianess
 
 
 %build
@@ -67,29 +67,40 @@ rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING README TODOandBUGS.txt TROUBLESHOOTING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/*.desktop
+%{_mandir}/man1/%{name}*
 
 
 %changelog
+* Tue May 26 2009 Todd Zullinger <tmz at pobox.com> - 0.99.14-1
+- Update to 0.99.14
+- Add GFDL to License tag, for documentation
+- Update xdg-open patch so it applies without fuzz
+- Drop libgnomecanvas-devel BR, it is not used anymore
+- Apply upstream patch to fix lame-tag endianess problem (this prevented gapless
+  playback from working correctly)
+- Update icon cache handling for current packaging guidelines
+
 * Sun Jan 18 2009 Todd Zullinger <tmz at pobox.com> - 0.99.12-4
 - Apply upstream fix for disappearing tooltips (#428940)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 Dec 2007 05:58:36 -0000	1.4
+++ sources	27 May 2009 03:18:57 -0000	1.5
@@ -1 +1 @@
-13162a7e9912028922aafcf81d908394  gtkpod-0.99.12.tar.gz
+f7948eceb955b302f4c47da4c0e1ec12  gtkpod-0.99.14.tar.gz


--- gtkpod-0.99.12-tooltips.patch DELETED ---


--- gtkpod-0.99.12-use-xdg-open.patch DELETED ---




More information about the fedora-extras-commits mailing list