rpms/grfcodec/devel compile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fedora-build.patch, 1.1, 1.2 grfcodec.spec, 1.2, 1.3 sources, 1.2, 1.3

Mon Aug 24 20:40:37 UTC 2009

Author: iarnell

Update of /cvs/pkgs/rpms/grfcodec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28916

Modified Files:
	.cvsignore fedora-build.patch grfcodec.spec sources 
Added Files:
	compile.patch 
Log Message:
* Mon Aug 24 2009 Iain Arnell <iarnell at gmail.com> 0.9.11-0.4.r2177
- update to current svn revision to remove "status updates"


compile.patch:
 getopt.c    |    4 ++--
 grfdiff.cc  |    4 ++--
 readinfo.cc |    1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE compile.patch ---
diff -up grfcodec/getopt.c.orig grfcodec/getopt.c
--- grfcodec/getopt.c.orig	2006-09-06 00:22:55.000000000 +0200
+++ grfcodec/getopt.c	2009-08-24 17:46:44.000000000 +0200
@@ -157,7 +157,7 @@ static enum
 
 char *getenv ();
 
-static char *my_index (const char *string, int chr)
+static const char *my_index (const char *string, int chr)
 {
   while (*string)
     {
@@ -520,7 +520,7 @@ int _getopt_internal (int argc, char *co
 
   {
     char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    const char *temp = my_index (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*nextchar == '\0')
diff -up grfcodec/grfdiff.cc.orig grfcodec/grfdiff.cc
--- grfcodec/grfdiff.cc.orig	2009-07-25 20:58:43.000000000 +0200
+++ grfcodec/grfdiff.cc	2009-08-24 17:47:56.000000000 +0200
@@ -253,7 +253,7 @@ void grfstore::getorgdata(U16 *size, U8 
 	fseek(grf, fpos_cur, SEEK_SET);
 }
 
-char *basename(const char *filename)
+char *grfbasename(const char *filename)
 {
 	static char bname[32];
 	fnsplit(filename, NULL, NULL, bname, NULL);
@@ -389,7 +389,7 @@ int mkdiff()
 	}
 
 	if (grd) {
-		char *noext = basename(grffile[1]);
+		char *noext = grfbasename(grffile[1]);
 		char *p;
 
 		for (p = noext; *p; p++) { *p = tolower(*p); }
diff -up grfcodec/readinfo.cc.orig grfcodec/readinfo.cc
--- grfcodec/readinfo.cc.orig	2009-08-03 21:49:30.000000000 +0200
+++ grfcodec/readinfo.cc	2009-08-24 17:47:25.000000000 +0200
@@ -39,6 +39,7 @@ Version 7: Add backslash escapes
 #include<string>
 #include<sstream>
 #include<iomanip>
+#include<cstdio>
 
 using namespace std;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 May 2009 03:17:43 -0000	1.2
+++ .cvsignore	24 Aug 2009 20:40:37 -0000	1.3
@@ -1 +1 @@
-grfcodec-r2111.tar.gz
+grfcodec-r2177.tar.gz

fedora-build.patch:
 Makefile        |    6 +++---
 Makefile.common |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: fedora-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/fedora-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fedora-build.patch	7 May 2009 03:17:43 -0000	1.1
+++ fedora-build.patch	24 Aug 2009 20:40:37 -0000	1.2
@@ -1,46 +1,7 @@
-diff -up grfcodec/getopt.c.fedora grfcodec/getopt.c
---- grfcodec/getopt.c.fedora	2006-09-06 00:22:55.000000000 +0200
-+++ grfcodec/getopt.c	2009-05-03 17:10:43.000000000 +0200
-@@ -157,7 +157,7 @@ static enum
- 
- char *getenv ();
- 
--static char *my_index (const char *string, int chr)
-+static const char *my_index (const char *string, int chr)
- {
-   while (*string)
-     {
-@@ -520,7 +520,7 @@ int _getopt_internal (int argc, char *co
- 
-   {
-     char c = *nextchar++;
--    char *temp = my_index (optstring, c);
-+    const char *temp = my_index (optstring, c);
- 
-     /* Increment `optind' when we start to process its last character.  */
-     if (*nextchar == '\0')
-diff -up /dev/null grfcodec/grfmrgc.S
---- /dev/null	2009-04-28 11:20:28.402126054 +0200
-+++ grfcodec/grfmrgc.S	2009-05-03 17:10:43.000000000 +0200
-@@ -0,0 +1,14 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+.section .data
-+.global _grfmrg,_grfmrgsize,grfmrg,grfmrgsize
-+
-+	.align 4
-+grfmrgsize:
-+_grfmrgsize: .int _grfmrg_end-_grfmrg
-+
-+grfmrg:
-+_grfmrg:	.incbin "grfmrgc.bin"
-+_grfmrg_end:
-diff -up grfcodec/Makefile.common.fedora grfcodec/Makefile.common
---- grfcodec/Makefile.common.fedora	2006-09-06 18:55:55.000000000 +0200
-+++ grfcodec/Makefile.common	2009-05-03 17:10:43.000000000 +0200
-@@ -7,14 +7,14 @@ FORCE:
+diff -up grfcodec/Makefile.common.orig grfcodec/Makefile.common
+--- grfcodec/Makefile.common.orig	2009-07-25 20:58:43.000000000 +0200
++++ grfcodec/Makefile.common	2009-08-24 17:54:59.000000000 +0200
+@@ -7,7 +7,7 @@ FORCE:
  	$(_C)make -f $(MAKEFILE) $(_S) $(@:%_r=%)
  	$(_E) [STRIP/UPX] $(@:%_r=%)
  	$(_C)strip  $(@:%_r=%)$(REL_EXE)
@@ -49,84 +10,42 @@ diff -up grfcodec/Makefile.common.fedora
  
  release: grfcodec_r grfdiff_r grfmerge_r
  
- # grfmrg.bin (the binary code included in grfdiff) can be either BCC or GCC code
- grfmrg.bin:	grfmerge.exe
- 	$(_E) [UPX] $@
--	$(_C)upx $(_Q) --best $< -o $@
-+	$(_C)upx $(_Q) --best $< -o $@ ||:
- 
- # make grfmerge.exe (as grfmrgc.bin) optimized for size instead of speed
- grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
-@@ -23,7 +23,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
+@@ -18,7 +18,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
  	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
  	$(_E) [STRIP/UPX] $@
  	$(_C)strip $@
 -	$(_C)upx $(_Q) --best $@
 +	$(_C)upx $(_Q) --best $@ ||:
  
- # making an assembly file which includes the above code; first for BCC
- grfmrg.ah:	grfmrg.bin 
-@@ -36,9 +36,9 @@ grfmrg.obj:	grfmrg.asm grfmrg.ah
- 	$(_C)tasm32 /dM32 /ml $< -c -o $@
- 
- # and then for GCC
--grfmrg.o:	grfmrgc.asm grfmrgc.bin
--	$(_E) [NASM] $@
--	$(_C)nasm -f $(NASMFORMAT) $< -o $@
-+grfmrg.o:	grfmrgc.S grfmrgc.bin
-+	$(_E) [AS] $@
-+	$(_C)as $< -o $@
- 
- ttdpal.h:	$(PAL_FILES) pal2c.pl
+ grfmrg.c:	grfmrgc.bin grfmrgc.pl
  	$(_E) [PERL] $@
-@@ -49,15 +49,15 @@ ttdpal.h:	$(PAL_FILES) pal2c.pl
- readinfo.o: readinfo.cc
- 	$(_E) [CPP] $@
- 	$(BOOST_WARN)	
--	$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
-+	$(_C)$(CXX) -c -o $@ -MMD -MF $@.d $(CXXFLAGS) $<
- 
- %.o : %.c
- 	$(_E) [CC] $@
--	$(_C)$(CC) -c -o $@ -MMD -MG -MF $@.d $(CFLAGS) $<
-+	$(_C)$(CC) -c -o $@ -MMD -MF $@.d $(CFLAGS) $<
- 
- %.o : %.cc
- 	$(_E) [CPP] $@
--	$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
-+	$(_C)$(CXX) -c -o $@ -MMD -MF $@.d $(CXXFLAGS) $<
- 
- % : %.o
- 	$(_E) [LD] $@
-@@ -76,7 +76,7 @@ readinfo.o: readinfo.cc
- # same as above but optimized for size not speed
- %.os : %.c
- 	$(_E) [CC] $@
--	$(_C)$(CC) -c -o $@ -MD -MG -MF $@.d $(CFLAGS) -Os $<
-+	$(_C)$(CC) -c -o $@ -MD -MF $@.d $(CFLAGS) -Os $<
- 
- % :: %.os
- 	$(_E) [LD] $@
-diff -up grfcodec/Makefile.fedora grfcodec/Makefile
---- grfcodec/Makefile.fedora	2009-05-03 17:12:30.000000000 +0200
-+++ grfcodec/Makefile	2009-05-03 17:12:45.000000000 +0200
-@@ -22,7 +22,7 @@ CXX = g++
+diff -up grfcodec/Makefile.orig grfcodec/Makefile
+--- grfcodec/Makefile.orig	2009-08-04 03:19:35.000000000 +0200
++++ grfcodec/Makefile	2009-08-24 17:54:47.000000000 +0200
+@@ -68,7 +68,7 @@ endif
+ endif
+ 
  # use 386 instructions but optimize for pentium II/III
- #CFLAGS = -g -DWIN32 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
- #CFLAGS = -g -DGCC64 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
--CFLAGS = -g -DGCC32 -O3 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
-+CFLAGS = -g -DGCC32 -I. $(BOOST_CMD) $(CFLAGAPP) -Wall
- CXXFLAGS = $(CFLAGS)
- #LDOPT = -g -Wl,--subsystem,console -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32
- #LDOPT = -Wl,--subsystem,console,-s
-diff -up grfcodec/readinfo.cc.fedora grfcodec/readinfo.cc
---- grfcodec/readinfo.cc.fedora	2009-04-28 21:17:02.000000000 +0200
-+++ grfcodec/readinfo.cc	2009-05-03 17:10:43.000000000 +0200
-@@ -39,6 +39,7 @@ Version 7: Add backslash escapes
- #include<string>
- #include<sstream>
- #include<iomanip>
-+#include<cstdio>
+-CFLAGS = -g -D$(TYPESIZE) -O3 -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
++CFLAGS = -g -D$(TYPESIZE) -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
+ 
+ ifeq ($(DEBUG),1)
+ CFLAGS += -DDEBUG
+@@ -221,7 +221,7 @@ FORCE:
+ 	$(_C)$(MAKE) ${_S} $(@:%_r=%)
+ 	$(_E) [STRIP/UPX] $(@:%_r=%)
+ 	$(_C)$(STRIP)  $(@:%_r=%)
+-	$(_C)upx $(_Q) --best  $(@:%_r=%)
++	$(_C)upx $(_Q) --best  $(@:%_r=%) ||:
+ 
+ release: $(GRFCODEC)_r $(GRFDIFF)_r $(GRFMERGE)_r
  
- using namespace std;
+@@ -232,7 +232,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%
+ 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
+ 	$(_E) [STRIP/UPX] $@
+ 	$(_C)$(STRIP) $@
+-	$(_C)upx $(_Q) --best $@
++	$(_C)upx $(_Q) --best $@ ||:
  
+ grfmrg.c:	grfmrgc.bin grfmrgc.pl
+ 	$(_E) [PERL] $@


Index: grfcodec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/grfcodec.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- grfcodec.spec	25 Jul 2009 01:27:09 -0000	1.2
+++ grfcodec.spec	24 Aug 2009 20:40:37 -0000	1.3
@@ -1,16 +1,17 @@
 Name:           grfcodec
 Version:        0.9.11
-Release:        0.3.r2111%{?dist}
+Release:        0.4.r2177%{?dist}
 Summary:        A suite of programs to modify Transport Tycoon Deluxe's GRF files
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.ttdpatch.net/grfcodec/
-# svn export -r2111 svn://svn.ttdpatch.net/misc/grfcodec
-# tar -czf grfcodec-r2111.tar.gz grfcodec
-Source0:        grfcodec-r2111.tar.gz
-# use gas, not nasm; fix build problems with gcc4.4; ignore upx failures; don't
-# pass -O3 to gcc
+# svn export -r2177 svn://svn.ttdpatch.net/misc/grfcodec
+# tar -czf grfcodec-r2177.tar.gz grfcodec
+Source0:        grfcodec-r2177.tar.gz
+# ignore upx failures; don't pass -O3 to gcc
 Patch0:         fedora-build.patch
+# fix build problems
+Patch1:         compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -24,6 +25,7 @@ A suite of programs to modify Transport 
 %prep
 %setup -q -n %{name}
 %patch0 -p 1 -b .fedora
+%patch1 -p 1 -b .compile
 
 for f in *.txt; do
   iconv -f iso8859-1 -t utf-8 $f >$f.conv 
@@ -54,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 24 2009 Iain Arnell <iarnell at gmail.com> 0.9.11-0.4.r2177
+- update to current svn revision to remove "status updates"
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.11-0.3.r2111
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grfcodec/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 May 2009 03:17:43 -0000	1.2
+++ sources	24 Aug 2009 20:40:37 -0000	1.3
@@ -1 +1 @@
-16286f814fb0cbbb24ed0253a98c0ab0  grfcodec-r2111.tar.gz
+a55bb56ed594f6ed4fe8a7717d8bc5c7  grfcodec-r2177.tar.gz


