rpms/rocksndiamonds/F-10 rocksndiamonds-3.2.6.0-music-info-url.patch, NONE, 1.1 rocksndiamonds-3.2.6.0-nosmpeg.patch, NONE, 1.1 rocksndiamonds.spec, 1.13, 1.14 sources, 1.7, 1.8

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446/F-10

Modified Files:
	rocksndiamonds.spec sources 
Added Files:
	rocksndiamonds-3.2.6.0-music-info-url.patch 
	rocksndiamonds-3.2.6.0-nosmpeg.patch 
Log Message:
update to 3.2.6.0

rocksndiamonds-3.2.6.0-music-info-url.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-music-info-url.patch ---
diff -up rocksndiamonds-3.2.6.0/src/files.c.url rocksndiamonds-3.2.6.0/src/files.c
--- rocksndiamonds-3.2.6.0/src/files.c.url	2008-07-14 11:55:01.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/files.c	2009-01-14 15:17:03.000000000 -0500
@@ -9214,11 +9214,13 @@ static struct MusicFileInfo *get_music_f
     { "artist_header",	&tmp_music_file_info.artist_header	},
     { "album_header",	&tmp_music_file_info.album_header	},
     { "year_header",	&tmp_music_file_info.year_header	},
+    { "url_header",	&tmp_music_file_info.url_header		},
 
     { "title",		&tmp_music_file_info.title		},
     { "artist",		&tmp_music_file_info.artist		},
     { "album",		&tmp_music_file_info.album		},
     { "year",		&tmp_music_file_info.year		},
+    { "url",		&tmp_music_file_info.url		},
 
     { NULL,		NULL					},
   };
@@ -9342,11 +9344,13 @@ void LoadMusicInfo()
     checked_free(music_file_info->artist_header);
     checked_free(music_file_info->album_header);
     checked_free(music_file_info->year_header);
+    checked_free(music_file_info->url_header);
 
     checked_free(music_file_info->title);
     checked_free(music_file_info->artist);
     checked_free(music_file_info->album);
     checked_free(music_file_info->year);
+    checked_free(music_file_info->url);
 
     free(music_file_info);
 
diff -up rocksndiamonds-3.2.6.0/src/main.h.url rocksndiamonds-3.2.6.0/src/main.h
--- rocksndiamonds-3.2.6.0/src/main.h.url	2008-07-14 17:42:31.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/main.h	2009-01-14 15:17:03.000000000 -0500
@@ -2699,11 +2699,13 @@ struct MusicFileInfo
   char *artist_header;
   char *album_header;
   char *year_header;
+  char *url_header;
 
   char *title;
   char *artist;
   char *album;
   char *year;
+  char *url;
 
   int music;
 
diff -up rocksndiamonds-3.2.6.0/src/screens.c.url rocksndiamonds-3.2.6.0/src/screens.c
--- rocksndiamonds-3.2.6.0/src/screens.c.url	2008-07-14 17:35:19.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/screens.c	2009-01-14 15:18:17.000000000 -0500
@@ -2497,6 +2497,16 @@ void HandleInfoScreen_Music(int button)
       DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
     }
 
+    if (!strEqual(list->url, UNKNOWN_NAME))
+    {
+      if (!strEqual(list->url_header, UNKNOWN_NAME))
+	DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->url_header);
+      else
+        DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the website");
+
+      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->url);
+    }
+
     DrawTextSCentered(ybottom, FONT_TEXT_4,
 		      "Press any key or button for next page");
 

rocksndiamonds-3.2.6.0-nosmpeg.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-nosmpeg.patch ---
diff -up rocksndiamonds-3.2.6.0/src/Makefile.BAD rocksndiamonds-3.2.6.0/src/Makefile
--- rocksndiamonds-3.2.6.0/src/Makefile.BAD	2009-01-14 15:15:40.000000000 -0500
+++ rocksndiamonds-3.2.6.0/src/Makefile	2009-01-14 15:15:52.000000000 -0500
@@ -102,13 +102,13 @@ endif
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-10/rocksndiamonds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rocksndiamonds.spec	20 Feb 2008 18:53:53 -0000	1.13
+++ rocksndiamonds.spec	14 Jan 2009 22:20:40 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		rocksndiamonds
-Version:	3.2.4
+Version:	3.2.6.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Amusements/Games
@@ -15,10 +15,10 @@
 Source2:	rocksndiamonds.png
 # Music files we have permission for!
 Source3:	rocksndiamonds-distributable-music.tar.bz2
-Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch0:		rocksndiamonds-3.2.6.0-nosmpeg.patch
 Patch1:		rocksndiamonds-highscore.patch
 Patch2:		rocksndiamonds-YN.patch
-Patch3:		rocksndiamonds-3.2.4-music-info-url.patch
+Patch3:		rocksndiamonds-3.2.6.0-music-info-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2008 18:53:53 -0000	1.7
+++ sources	14 Jan 2009 22:20:40 -0000	1.8
@@ -1,2 +1,2 @@
-d4803571066862c9c8484b2b913381f8  rocksndiamonds-3.2.4-clean.tar.gz
+bb77a0c6a5737a863528053a27fad430  rocksndiamonds-3.2.6.0-clean.tar.gz
 6a9a5ae28689254363c91716fbad1824  rocksndiamonds-distributable-music.tar.bz2