Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 46900 - media-sound/xmms-1.2.10-r2
Summary: media-sound/xmms-1.2.10-r2
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All All
: High normal (vote)
Assignee: Jeremy Huddleston (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-04-05 15:25 UTC by Dale K Dicks
Modified: 2004-05-31 00:33 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
xmms-1.2.10-recode-csa27.3.revertToOld.patch (xmms-1.2.10-recode-csa27.3.revertToOld.patch,4.79 KB, patch)
2004-04-06 14:41 UTC, Jeremy Huddleston (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dale K Dicks 2004-04-05 15:25:41 UTC
media-sound/xmms-1.2.10-r2 breaks the CornerXMMS gdesklet -- or depending on how you look at it, CornerXMMS does not work with this version of XMMS.

instead of the song/stream/track title scrolling, you get some numbers scrolling.

i downgraded to -r1 nad the CornerXMMS gdesklet works again.
Comment 1 Jeremy Huddleston (RETIRED) gentoo-dev 2004-04-06 10:16:39 UTC
odd... only about 10 lines of code changed between these versions... can you try commenting out the recode patch in the xmms ebuild to see if that fixes your problem?
Comment 2 Dale K Dicks 2004-04-06 12:14:31 UTC
It works with these changes.

        # Patch for mpg123 to convert Japanese character code of MP3 tag info
        # the Japanese patch and the Russian one overlap, so its one or the other
        if use cjk; then
                epatch ${PATCHDIR}/${P}-mpg123j.patch
#       else
#               # add recode patch http://sourceforge.net/projects/rusxmms/
#               epatch ${PATCHDIR}/${P}-recode-csa27.3.patch
        fi
Comment 3 Jeremy Huddleston (RETIRED) gentoo-dev 2004-04-06 14:41:23 UTC
Created attachment 28806 [details, diff]
xmms-1.2.10-recode-csa27.3.revertToOld.patch

revert recode patch to 1.2.10-r1 version...
Comment 4 Jeremy Huddleston (RETIRED) gentoo-dev 2004-04-06 14:44:26 UTC
can youu save that patch and apply it as below (I assumed you saved it to /tmp)

        # Patch for mpg123 to convert Japanese character code of MP3 tag info
        # the Japanese patch and the Russian one overlap, so its one or the other
        if use cjk; then
                epatch ${PATCHDIR}/${P}-mpg123j.patch
       else
               # add recode patch http://sourceforge.net/projects/rusxmms/
               epatch ${PATCHDIR}/${P}-recode-csa27.3.patch
               epatch /tmp/xmms-1.2.10-recode-csa27.3.revertToOld.patch
        fi

Loet me know if that fixes the problem, and if so, could you try to narrow down what in that patch causes the problem...  if you're not comfortable with messing with source like that, I can try to figure it out, but I don't use cornerxmms so it will take more time...
Comment 5 Dale K Dicks 2004-04-06 15:25:16 UTC
That fixed the problem.

I'm not really a programmer but I'll take a look and see if I can see what is messing it up.
Comment 6 Jeremy Huddleston (RETIRED) gentoo-dev 2004-04-06 18:49:26 UTC
btw... dunno if you know this, but it's a huge timesaver you don't need to remcompile all of xmms every time during debugging...

$ cd /usr/portage/media-sound/xmms
$ ebuild xmms-1.2.10-r2.ebuild merge

this leaves the code in portage tmp folder, so you can goto it:
$ pushd /usr/tmp/portage/xmms-1.2.10-r2/work/xmms-1.2.10-r2

now remove the patch I posted here (this assumes that the ebuild you used was the one with the patch... if not, skip):
$ patch -p1 -R < /tmp/xmms-1.2.10-recode-csa27.3.revertToOld.patch

then copy that patch somewhere, edit it to remove the fixes to the last two files (the bottom two chunks where it starts out with ++++ and ---- lines) and apply that:
$ patch -p1 < /tmp/xmms-1.2.10-recode-csa27.3.revertToOld.modified.patch

now go back and try merging that:
$ popd
$ rm /usr/tmp/portage/xmms-1.2.10-r2/.compiled (this forces the updated code to be recompiled, but it doesn't unpack everything again and reapply the patches... assuming youu don't update the ebuild).
$ ebuild xmms-1.2.10-r2.ebuild merge

then go and revert that modified patch (with the -R like you did above) and you can keep modifying it to zoom in on the problem code.
Comment 7 Dale K Dicks 2004-04-07 06:27:53 UTC
I have tracked it down this far.  I'll start eliminating parts of this to see if I can find out exactly what it is.

diff -Naur xmms-1.2.10.dtd.id3v2.recode/xmms/playlist.c xmms-1.2.10.dtd.id3v2.recode.old/xmms/playlist.c
--- xmms-1.2.10.dtd.id3v2.recode/xmms/playlist.c	2004-04-04 16:45:12.000000000 -0700
+++ xmms-1.2.10.dtd.id3v2.recode.old/xmms/playlist.c	2004-04-06 14:38:32.000000000 -0700
@@ -1402,9 +1402,9 @@
 
 	filename = g_strdup(entry->filename);
 	
-	if (entry->title == NULL || entry->length == -1)
+	if (entry->title == NULL && entry->length == -1)
 	{
-		if (playlist_get_info_entry(entry)&&(entry->title)) {
+		if (playlist_get_info_entry(entry)) {
 			title = xmms_charset_recode_id3(entry->title,0,NULL);
 			if (!title)
 			title = g_strdup(entry->title);
Comment 8 Dale K Dicks 2004-04-07 06:46:49 UTC
This is the part of the revert patch that fixes the bug, the rest of the patch can be left out.

-	if (entry->title == NULL || entry->length == -1)
+	if (entry->title == NULL && entry->length == -1)

If it is compiled with the || instead of the && it breaks the song title display in the CornerXMMS Desklet.

Comment 9 Jeremy Huddleston (RETIRED) gentoo-dev 2004-04-07 08:59:11 UTC
odd... that little snippet of code looks right to me... i wonder why it's behaving like that...  I created a bug upstream so they can look at it:

http://sourceforge.net/tracker/index.php?func=detail&aid=931146&group_id=65796&atid=512282

Comment 10 SpanKY gentoo-dev 2004-04-07 18:32:30 UTC
applying the patch after the recode patch fixed streaming titles in shaded mode for me
Comment 11 Markus Nigbur (RETIRED) gentoo-dev 2004-04-08 09:28:16 UTC
Confirming SpanKY's comment. The attached patch fixed it.
Comment 12 Jeremy Huddleston (RETIRED) gentoo-dev 2004-05-31 00:33:29 UTC
this is fixed in -r3