rpms/koules/devel koules-1.4-imake.patch, 1.1, 1.2 koules-1.4-make.patch, 1.1, 1.2 koules-1.4-mode.patch, 1.1, 1.2 koules-1.4-overflows.patch, 1.1, 1.2 koules-1.4-retrace.patch, 1.1, 1.2 koules-1.4-shm.patch, 1.1, 1.2 koules.desktop, 1.1, 1.2 koules.spec, 1.6, 1.7
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Mar 16 21:59:46 UTC 2009
Author: lkundrak
Update of /cvs/pkgs/rpms/koules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2659
Modified Files:
koules-1.4-imake.patch koules-1.4-make.patch
koules-1.4-mode.patch koules-1.4-overflows.patch
koules-1.4-retrace.patch koules-1.4-shm.patch koules.desktop
koules.spec
Log Message:
* Mon Mar 16 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-5
- Require fonts
- Fix Xshm support
koules-1.4-imake.patch:
Index: koules-1.4-imake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-imake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-imake.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-imake.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,5 +1,7 @@
Install to relative location and look for the sound server in the right place.
+Lubomir Rintel <lkundrak at v3.sk>
+
--- koules1.4/Imakefile.imake 2007-10-28 02:59:43.000000000 +0100
+++ koules1.4/Imakefile 2007-10-28 03:01:57.000000000 +0100
@@ -56,7 +56,7 @@
koules-1.4-make.patch:
Index: koules-1.4-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-make.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-make.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,5 +1,7 @@
Do not add arbitrary compiler flags and install into relative location.
+Lubomir Rintel <lkundrak at v3.sk>
+
--- koules1.4/Makefile.svgalib.make 1998-03-09 16:48:49.000000000 +0100
+++ koules1.4/Makefile.svgalib 2007-10-29 17:46:02.000000000 +0100
@@ -24,11 +24,10 @@
koules-1.4-mode.patch:
Index: koules-1.4-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-mode.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-mode.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,6 +1,10 @@
Dynamically decide about window size based on information from the windowing
system.
+Looks well on bigger displays, yet kind of sucks with network play.
+
+Lubomir Rintel <lkundrak at v3.sk>
+
--- koules1.4/xlib/init.c.mode 2007-10-28 02:31:47.000000000 +0100
+++ koules1.4/xlib/init.c 2007-10-28 02:31:55.000000000 +0100
@@ -362,6 +362,12 @@
koules-1.4-overflows.patch:
Index: koules-1.4-overflows.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-overflows.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-overflows.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-overflows.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,6 +1,8 @@
This fixes some buffer overflow, that are not severe, unless koules.svga
is installed setuid root. Not by default. The first hunk is from Debian.
+Lubomir Rintel <lkundrak at v3.sk>
+
--- koules-1.4.orig/koules.sndsrv.linux.c
+++ koules-1.4/koules.sndsrv.linux.c
@@ -65,10 +65,9 @@
koules-1.4-retrace.patch:
Index: koules-1.4-retrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-retrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-retrace.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-retrace.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,5 +1,7 @@
This include no longer exists and seems unneeded.
+Lubomir Rintel <lkundrak at v3.sk>
+
--- koules1.4/svgalib/init.c.orig 2007-10-28 00:21:19.000000000 +0200
+++ koules1.4/svgalib/init.c 2007-10-28 00:21:35.000000000 +0200
@@ -44,7 +44,6 @@
koules-1.4-shm.patch:
Index: koules-1.4-shm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules-1.4-shm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules-1.4-shm.patch 4 Nov 2007 19:36:05 -0000 1.1
+++ koules-1.4-shm.patch 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,4 +1,7 @@
-Fix disabling of XShm support, which is broken in xkoules.
+Fix depth detection anddisabling of XShm support. Now that we get
+depth right, we no longer disable XShm though.
+
+Lubomir Rintel <lkundrak at v3.sk>
--- koules1.4/xlib/init.c.shm 2007-10-28 02:37:54.000000000 +0200
+++ koules1.4/xlib/init.c 2007-10-28 02:38:49.000000000 +0200
@@ -45,13 +48,16 @@
}
else
{
-@@ -410,7 +420,9 @@
+@@ -411,8 +427,11 @@ initialize (char **argv, int argc)
}
}
else
+#ifdef MITSHM
bpp = 1;
+- depth = vinfo_return.depth;
+#endif
- depth = vinfo_return.depth;
++ if (depth = vinfo_return.depth > 24)
++ depth = 24;
#ifdef MITSHM
/* Make sure all is destroyed if killed off */
+
Index: koules.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koules.desktop 4 Nov 2007 19:36:05 -0000 1.1
+++ koules.desktop 16 Mar 2009 21:59:43 -0000 1.2
@@ -1,9 +1,8 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Koules
Comment=Classic Linux action game with network multiplayer support
Exec=/usr/bin/xkoules
-Icon=/usr/share/pixmaps/koules.xpm
+Icon=koules
Terminal=false
Type=Application
Categories=Application;Game;ArcadeGame;
Index: koules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koules/devel/koules.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- koules.spec 16 Mar 2009 21:21:14 -0000 1.6
+++ koules.spec 16 Mar 2009 21:59:43 -0000 1.7
@@ -123,10 +123,7 @@
# Build X11 variant
cd $RPM_BUILD_DIR/%{name}-%{version}-x11/%{name}%{version}
-# Xshm is broken at the time
-echo '#undef MITSHM' >> Iconfig
-echo '#define HAVEUSLEEP' >> Iconfig
-#sed 's,#define MITSHM,#undef MITSHM,' -i Iconfig
+echo '#define HAVEUSLEEP' >>Iconfig
xmkmf -a
make %{makedirs} CCOPTIONS="%{optflags}"
@@ -141,7 +138,7 @@
# Install SVGAlib variant
cd $RPM_BUILD_DIR/%{name}-%{version}-svga/%{name}%{version}
make -f Makefile.svgalib install %{makedirs} DESTDIR=$RPM_BUILD_ROOT \
- INSTALLSOUND=False
+ INSTALLSOUND=False
%endif
# Install X11 variant, and sound
@@ -170,6 +167,7 @@
%doc %{name}%{version}/TODO
%files sound
+%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_libexecdir}/%{name}
@@ -189,6 +187,7 @@
%changelog
* Mon Mar 16 2009 Lubomir Rintel <lkundrak at v3.sk> 1.4-5
- Require fonts
+- Fix Xshm support
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list