rpms/ClanLib1/F-12 ClanLib-0.8.0-gcc43.patch, NONE, 1.1 ClanLib-1.0.0-fullscreen-viewport.patch, NONE, 1.1 ClanLib1.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Nov 9 09:17:28 UTC 2009

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib1/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15599

Modified Files:
	.cvsignore sources 
Added Files:
	ClanLib-0.8.0-gcc43.patch 
	ClanLib-1.0.0-fullscreen-viewport.patch ClanLib1.spec 
Log Message:
* Tue Nov  3 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-4
- Rename package from ClanLib to ClanLib1, so that the ClanLib package name
  can be used for the new 2.x series, without dropping ClanLib-1.x from
  the distro as most ClanLib packages still need 1.x to build / run


ClanLib-0.8.0-gcc43.patch:
 GLX/input_device_linuxevent.cpp |    1 +
 GLX/input_device_xinput.cpp     |    1 +
 canvas_opengl.cpp               |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE ClanLib-0.8.0-gcc43.patch ---
diff -up ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp
--- ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp~	2007-10-21 02:14:01.000000000 +0200
+++ ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp	2009-05-17 21:13:53.000000000 +0200
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <errno.h>
 #include <cstring>
+#include <cstdio>
 
 #include "API/Core/System/error.h"
 #include "API/Core/System/clanstring.h"
diff -up ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp
--- ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp~	2007-10-21 02:14:01.000000000 +0200
+++ ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp	2009-05-17 21:14:15.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <iostream>
 #include <cstring>
+#include <cstdio>
 #include "API/Core/System/log.h"
 #include "API/Display/input_device.h"
 #include "API/Display/input_event.h"
diff -up ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp~ ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp
--- ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp~	2007-10-21 02:14:01.000000000 +0200
+++ ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp	2009-05-17 21:10:45.000000000 +0200
@@ -48,6 +48,7 @@
 #include "graphic_context_opengl.h"
 #include "surface_target_opengl.h"
 #include <cstring>
+#include <cstdio>
 
 /////////////////////////////////////////////////////////////////////////////
 // CL_Canvas_OpenGL construction:

ClanLib-1.0.0-fullscreen-viewport.patch:
 display_window_opengl.cpp |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ClanLib-1.0.0-fullscreen-viewport.patch ---
diff -up ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp~ ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp
--- ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp~	2008-11-13 17:09:02.000000000 +0100
+++ ClanLib-1.0.0/Sources/GL/GLX/display_window_opengl.cpp	2009-09-10 22:58:10.000000000 +0200
@@ -612,6 +612,13 @@ void CL_DisplayWindow_OpenGL::set_resolu
 				XF86VidModeGetViewPort(disp, vi->screen,
 					&old_x, &old_y);
 			}
+			/* Warp the pointer to the upper left corner, this is
+			   necessary as the: XF86VidModeSetViewPort() call
+			   below does not seem to do anything on newer Xorg
+			   servers, instead the viewport appears to be always
+			   centered at the last mouse position */
+			XWarpPointer(disp, None, XDefaultRootWindow(disp),
+				     0, 0, 0, 0, 0, 0);
 			XF86VidModeSwitchToMode(disp, vi->screen,
 				modes[i]);
 		}


--- NEW FILE ClanLib1.spec ---
%define realname ClanLib

Summary:        Cross platform C++ game library
Name:           ClanLib1
Version:        1.0.0
Release:        4%{?dist}
Group:          System Environment/Libraries
License:        zlib
URL:            http://www.clanlib.org/
Source0:        http://www.clanlib.org/download/releases-1.0/%{realname}-%{version}.tgz
# Prebuild docs to avoid multilib conflicts. To regenerate, build and install
# ClanLib without passing --disable-docs (requires perl, libxslt) and then:
# mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html
# tar cvfz ClanLib-%{version}-generated-docs.tar.gz html
Source1:        ClanLib-%{version}-generated-docs.tar.gz
Patch0:         ClanLib-0.8.0-gcc43.patch
Patch1:         ClanLib-1.0.0-fullscreen-viewport.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
BuildRequires:  libvorbis-devel mikmod-devel SDL-devel SDL_gfx-devel
BuildRequires:  libpng-devel libjpeg-devel
# Obsoletes for upgrade path, no Provides as "ClanLib" will be provided
# By the new ClanLib-2.x package
Obsoletes:      ClanLib < %{version}-%{release}

%description
ClanLib is a cross platform C++ game library.


%package devel
Summary:        Development Libraries and Headers for ClanLib
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       libGLU-devel xorg-x11-proto-devel pkgconfig
# Obsoletes for upgrade path, no Provides as "ClanLib-devel" will be provided
# By the new ClanLib-devel-2.x package
Obsoletes:      ClanLib-devel < %{version}-%{release}

%description devel
ClanLib development headers and libraries


%prep
%setup -q -a 1 -n %{realname}-%{version}
%patch0 -p1
%patch1 -p1
iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8
touch -r NEWS.utf8 NEWS
mv NEWS.utf8 NEWS
iconv -f iso8859-1 -t utf8 CREDITS -o CREDITS.utf8
touch -r CREDITS.utf8 CREDITS
mv CREDITS.utf8 CREDITS
# fixup pc files
sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{realname}-1.0|' \
  pkgconfig/clan*.pc.in


%build
%configure --disable-dependency-tracking --disable-static --enable-dyn \
  --disable-docs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# put .so links in a subdir of %{libdir} so they don't conflict with
# ClanLib06-devel .so links. The pkg-config files are patches to transparently
# handle this for applications using us.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{realname}-1.0
mv $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/%{realname}-1.0
for i in $RPM_BUILD_ROOT%{_libdir}/%{realname}-1.0/*; do
  ln -sf ../`readlink $i` $i
done
# we're API compatible with 0.8, add 0.8 pkgconfig symlinks, so 0.8
# expecting sources can be build against us
for i in $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc; do
  ln -s `basename $i` `echo $i|sed 's/1\.0\.pc/0\.8\.pc/'`
done


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING CREDITS NEWS TODO-RSN
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc README* html
%{_libdir}/%{realname}-1.0
%{_includedir}/%{realname}-1.0
%{_libdir}/pkgconfig/clan*.pc


%changelog
* Tue Nov  3 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-4
- Rename package from ClanLib to ClanLib1, so that the ClanLib package name
  can be used for the new 2.x series, without dropping ClanLib-1.x from
  the distro as most ClanLib packages still need 1.x to build / run

* Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-3
- Fix (workaround) viewport issues in fullscreen mode (#522116)

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Sun May 17 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-1
- New upstream release 1.0.0, note: API compatible but changes soname

* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Feb 21 2009 Hans de Goede <hdegoede at redhat.com> 0.8.1-2
- Fix build with gcc 4.4  

* Wed Mar 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.1-1
- New upstream release
- Drop all patches (all upstreamed)
- Add patch to keep libclanDisplay-0.8 abi compatible with 0.8.0
- Warning, this release changes the ABI of the GUIStyleSilver input_box widget
- Warning, some small API changes, CL_KEY_ADD -> CL_KEY_NUMPAD_ADD, etc.

* Sat Mar  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-11
- Add a patch from Dave Jones fixing various wrong invocations of memset

* Sun Mar  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-10
- Add support for audio output through alsa (original ClanLib only supports
  OSS??), this also adds support for using pulseaudio through alsa

* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.0-9
- Autorebuild for GCC 4.3

* Fri Jan  4 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-8
- Fix building with gcc 4.3

* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-7
- Fix multilib conflicts in generated Reference documentation (bz 340851)

* Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-6
- Update License tag for new Licensing Guidelines compliance

* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 0.8.0-5
- Rebuild against SDL_gfx 2.0.16.

* Sat Mar 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-4
- Fix some stupidness in the OpenGL surface code, which triggers an obscure
  bug in mesa-6.5.2, as a bonus the OpenGL surface's should be somewhat faster
  now. Details: https://bugs.freedesktop.org/show_bug.cgi?id=10491

* Sun Oct  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-3
- Rewrote ClanLib fullscreen handling to fix an issue where a part of the
  window decoration show in fullscreen mode on certain videocards

* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-2
- FE6 Rebuild

* Sun Aug 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-1
- 0.8.0 final, warning ABI changed without soname change!
- Drop both our patches (both upstreamed)

* Wed Jul 26 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.6.RC2
- Add missing Requires: pkgconfig to -devel package

* Tue Jul 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.5.RC2
- Add libXt-devel BR to fix X detection on FC-5, sorry about all these
  missing BRs and Requires.

* Tue Jul 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.4.RC2
- Add libGLU-devel to the BuildRequires to fix build on FC-5
- Add missing Requires: libGLU-devel xorg-x11-proto-devel to -devel package

* Tue Jul 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.3.RC2
- Add libXi-devel to the BuildRequires so that clanGL gets build

* Fri Jul 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.2.RC2
- Change License: to "zlib License" as 0.8 is under the zlib License not the
  LGPL (0.6 is LGPL).
- Add a patch from pingus contrib dir which adds support for the grave key
- Add libXmu-devel to the BuildRequires

* Wed Jul 19 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.1.RC2
- Initial FE version based on the newrpms SRPM by Che.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib1/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Nov 2009 20:38:18 -0000	1.1
+++ .cvsignore	9 Nov 2009 09:17:28 -0000	1.2
@@ -0,0 +1,2 @@
+ClanLib-1.0.0-generated-docs.tar.gz
+ClanLib-1.0.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib1/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Nov 2009 20:38:19 -0000	1.1
+++ sources	9 Nov 2009 09:17:28 -0000	1.2
@@ -0,0 +1,2 @@
+33de5771bee71214ac5c3af81b369cb4  ClanLib-1.0.0-generated-docs.tar.gz
+281e64a463155474d0f1270686286811  ClanLib-1.0.0.tgz


