From 2eb210d2a51f7f04da2856aa19c6b4d0575af8cc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 13 Dec 2006 15:00:34 +0000 Subject: [PATCH 01/19] - New upstream release 0.4.0 final --- .cvsignore | 2 +- alleggl.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5c14b76..3f82eff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alleggl-0.4.0_rc4.tar.bz2 +alleggl-0.4.0.tar.bz2 diff --git a/alleggl.spec b/alleggl.spec index dbc778a..7254774 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,13 +1,11 @@ -%define pre_version rc4 - Name: alleggl Version: 0.4.0 -Release: 0.5.%{pre_version}%{?dist} +Release: 1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib License URL: http://allegrogl.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}_%{pre_version}.tar.bz2 +Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -86,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 13 2006 Hans de Goede 0.4.0-1 +- New upstream release 0.4.0 final + * Mon Aug 28 2006 Hans de Goede 0.4.0-0.5.rc4 - FE6 Rebuild diff --git a/sources b/sources index 9c661a5..0e0e952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cbe43f8fa2488a7e7d6e9807e5f0100 alleggl-0.4.0_rc4.tar.bz2 +43e5d123fa5c78ade8e9b486b4102998 alleggl-0.4.0.tar.bz2 From 642b368bf390782683ed1fb2fce634ef9ade0d7b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 3 Jun 2007 18:39:55 +0000 Subject: [PATCH 02/19] - New upstream release 0.4.1 final --- .cvsignore | 2 +- alleggl.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3f82eff..728cbb6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alleggl-0.4.0.tar.bz2 +alleggl-0.4.1.tar.bz2 diff --git a/alleggl.spec b/alleggl.spec index 7254774..c871d10 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,11 +1,11 @@ Name: alleggl -Version: 0.4.0 +Version: 0.4.1 Release: 1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries -License: zlib License +License: zlib/libpng License URL: http://allegrogl.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -38,7 +38,10 @@ developing applications that use %{name}. %build -%configure --disable-static +# the --with-x-foo is there so that configure doesn't add -L/usr/lib to +# the LDFLAGS, as that will result in an installed older alleggl getting used +# during the linking of the examples, possibly resulting in an error +%configure --disable-static --x-includes='' --x-libraries='' make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ CFLAGS="$RPM_OPT_FLAGS -ffast-math" @@ -74,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc bugs.txt todo.txt -%{_libdir}/libagl.so.0 +%{_libdir}/libagl.so.0* %files devel %defattr(-,root,root,-) @@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 3 2007 Hans de Goede 0.4.1-1 +- New upstream release 0.4.1 final + * Wed Dec 13 2006 Hans de Goede 0.4.0-1 - New upstream release 0.4.0 final diff --git a/sources b/sources index 0e0e952..0d580b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43e5d123fa5c78ade8e9b486b4102998 alleggl-0.4.0.tar.bz2 +b08cd58b37e1d3185c13d997a179ddc0 alleggl-0.4.1.tar.bz2 From b38ed86047758ef528dba4a07e0b776f6b0dec7d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 22 Jul 2007 12:43:10 +0000 Subject: [PATCH 03/19] - New upstream release 0.4.2 RC1 --- .cvsignore | 2 +- alleggl.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 728cbb6..dddd1b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alleggl-0.4.1.tar.bz2 +alleggl-0.4.2.tar.bz2 diff --git a/alleggl.spec b/alleggl.spec index c871d10..9ee2e5b 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl -Version: 0.4.1 -Release: 1%{?dist} +Version: 0.4.2 +Release: 0.1.rc1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib/libpng License @@ -45,14 +45,18 @@ developing applications that use %{name}. make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ CFLAGS="$RPM_OPT_FLAGS -ffast-math" +pushd docs +doxygen Doxyfile +popd + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # clean up messy alleggl install -mv $RPM_BUILD_ROOT%{_libdir}/libagl.so $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -chmod +x $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -ln -s libagl.so.0 $RPM_BUILD_ROOT%{_libdir}/libagl.so +# mv $RPM_BUILD_ROOT%{_libdir}/libagl.so $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 +# chmod +x $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 +# ln -s libagl.so.0 $RPM_BUILD_ROOT%{_libdir}/libagl.so # alleggl installs an autoheader generated header file which could very # well conflict with other autoheader generated header files, so we override # this with our own version which contains only the bare minimum: @@ -87,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 22 2007 Hans de Goede 0.4.2-0.1.rc1 +- New upstream release 0.4.2 RC1 + * Sun Jun 3 2007 Hans de Goede 0.4.1-1 - New upstream release 0.4.1 final diff --git a/sources b/sources index 0d580b8..065b452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b08cd58b37e1d3185c13d997a179ddc0 alleggl-0.4.1.tar.bz2 +e9432c7e29d88252ad65568f3aa3b814 alleggl-0.4.2.tar.bz2 From 0d94b9fa2469391359dfb117d74a63a279a840c6 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 22 Jul 2007 14:09:46 +0000 Subject: [PATCH 04/19] - New upstream release 0.4.2 RC1 --- alleggl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alleggl.spec b/alleggl.spec index 9ee2e5b..9d07a64 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -8,7 +8,7 @@ URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel -BuildRequires: libXpm-devel libXxf86vm-devel +BuildRequires: libXpm-devel libXxf86vm-devel doxygen %description AllegroGL is an Allegro add-on that allows you to use OpenGL alongside Allegro. From aa319b7165378fad8c17a8362b0740183b873523 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 3 Aug 2007 18:58:24 +0000 Subject: [PATCH 05/19] - Update License tag for new Licensing Guidelines compliance --- alleggl.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alleggl.spec b/alleggl.spec index 9d07a64..48f1dde 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,9 +1,9 @@ Name: alleggl Version: 0.4.2 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries -License: zlib/libpng License +License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Jul 22 2007 Hans de Goede 0.4.2-0.1.rc1 -- New upstream release 0.4.2 RC1 +* Thu Aug 2 2007 Hans de Goede 0.4.2-0.2.rc1 +- Update License tag for new Licensing Guidelines compliance * Sun Jun 3 2007 Hans de Goede 0.4.1-1 - New upstream release 0.4.1 final From 0e1d452a63a226e6221896c523f55874b148df8e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 21 Oct 2007 09:50:45 +0000 Subject: [PATCH 06/19] - Upstream has renamed rc1 to final, so drop the .rc1 from the release field - Fix multilib conflicts in doxygen documentation (bz 340611) --- .cvsignore | 1 + alleggl.spec | 15 +++++++++------ sources | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index dddd1b7..ddba0b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ alleggl-0.4.2.tar.bz2 +alleggl-doxygen-docs.tar.gz diff --git a/alleggl.spec b/alleggl.spec index 48f1dde..f480aa5 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,11 +1,14 @@ Name: alleggl Version: 0.4.2 -Release: 0.2.rc1%{?dist} +Release: 1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 +# prebuild doxygen docs to avoid multilib conflicts. To regenerate: untar, +# cd docs, doxygen Doxyfile, cd .., tar cvfz alleggl-doxygen-docs.tar.gz docs +Source1: alleggl-doxygen-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel doxygen @@ -34,7 +37,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{name} +%setup -q -a 1 -n %{name} %build @@ -45,10 +48,6 @@ developing applications that use %{name}. make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ CFLAGS="$RPM_OPT_FLAGS -ffast-math" -pushd docs -doxygen Doxyfile -popd - %install rm -rf $RPM_BUILD_ROOT @@ -91,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 21 2007 Hans de Goede 0.4.2-1 +- Upstream has renamed rc1 to final, so drop the .rc1 from the release field +- Fix multilib conflicts in doxygen documentation (bz 340611) + * Thu Aug 2 2007 Hans de Goede 0.4.2-0.2.rc1 - Update License tag for new Licensing Guidelines compliance diff --git a/sources b/sources index 065b452..0de7364 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ e9432c7e29d88252ad65568f3aa3b814 alleggl-0.4.2.tar.bz2 +d3551545c7d17fe2a53aaadf1d3be212 alleggl-doxygen-docs.tar.gz From c3277405c5f56c92364c0c300ff71a43ffeb4042 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 21 Oct 2007 11:36:02 +0000 Subject: [PATCH 07/19] - Some cleanups to the multilib doxygen documentation bugfix --- .cvsignore | 2 +- alleggl.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index ddba0b9..ddaa0e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ alleggl-0.4.2.tar.bz2 -alleggl-doxygen-docs.tar.gz +alleggl-0.4.2-doxygen-docs.tar.gz diff --git a/alleggl.spec b/alleggl.spec index f480aa5..5cfccc2 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,17 +1,18 @@ Name: alleggl Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 # prebuild doxygen docs to avoid multilib conflicts. To regenerate: untar, -# cd docs, doxygen Doxyfile, cd .., tar cvfz alleggl-doxygen-docs.tar.gz docs -Source1: alleggl-doxygen-docs.tar.gz +# cd docs, doxygen Doxyfile, cd .., +# tar cvfz %{name}-%{version}-doxygen-docs.tar.gz docs +Source1: %{name}-%{version}-doxygen-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel -BuildRequires: libXpm-devel libXxf86vm-devel doxygen +BuildRequires: libXpm-devel libXxf86vm-devel %description AllegroGL is an Allegro add-on that allows you to use OpenGL alongside Allegro. @@ -90,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 21 2007 Hans de Goede 0.4.2-2 +- Some cleanups to the multilib doxygen documentation bugfix + * Sun Oct 21 2007 Hans de Goede 0.4.2-1 - Upstream has renamed rc1 to final, so drop the .rc1 from the release field - Fix multilib conflicts in doxygen documentation (bz 340611) diff --git a/sources b/sources index 0de7364..5174455 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e9432c7e29d88252ad65568f3aa3b814 alleggl-0.4.2.tar.bz2 -d3551545c7d17fe2a53aaadf1d3be212 alleggl-doxygen-docs.tar.gz +d3551545c7d17fe2a53aaadf1d3be212 alleggl-0.4.2-doxygen-docs.tar.gz From 589902ea360f05fe8900386abb914f33686b9ca9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 11 Nov 2007 11:42:33 +0000 Subject: [PATCH 08/19] - New upstream release 0.4.3 - Drop prebuild doxygen Source as upstream now includes prebuild doxygen docs --- .cvsignore | 3 +-- alleggl.spec | 20 +++++++++----------- sources | 3 +-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index ddaa0e4..85371d0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -alleggl-0.4.2.tar.bz2 -alleggl-0.4.2-doxygen-docs.tar.gz +alleggl-0.4.3.tar.bz2 diff --git a/alleggl.spec b/alleggl.spec index 5cfccc2..a284bd7 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,15 +1,11 @@ Name: alleggl -Version: 0.4.2 -Release: 2%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 -# prebuild doxygen docs to avoid multilib conflicts. To regenerate: untar, -# cd docs, doxygen Doxyfile, cd .., -# tar cvfz %{name}-%{version}-doxygen-docs.tar.gz docs -Source1: %{name}-%{version}-doxygen-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -38,7 +34,7 @@ developing applications that use %{name}. %prep -%setup -q -a 1 -n %{name} +%setup -q -n %{name} %build @@ -53,10 +49,7 @@ make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# clean up messy alleggl install -# mv $RPM_BUILD_ROOT%{_libdir}/libagl.so $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -# chmod +x $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -# ln -s libagl.so.0 $RPM_BUILD_ROOT%{_libdir}/libagl.so + # alleggl installs an autoheader generated header file which could very # well conflict with other autoheader generated header files, so we override # this with our own version which contains only the bare minimum: @@ -64,6 +57,7 @@ echo '#define ALLEGROGL_HAVE_DYNAMIC_LINK 1' \ > $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h echo '#define ALLEGROGL_HAVE_XF86VIDMODE 1' \ >> $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h + # we don't want these files to end up under %%doc and there is no way # to %%exclude files from %%doc, so we remove them rm docs/html/index.hh? @@ -91,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 11 2007 Hans de Goede 0.4.3-1 +- New upstream release 0.4.3 +- Drop prebuild doxygen Source as upstream now includes prebuild doxygen docs + * Sun Oct 21 2007 Hans de Goede 0.4.2-2 - Some cleanups to the multilib doxygen documentation bugfix diff --git a/sources b/sources index 5174455..4385c59 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e9432c7e29d88252ad65568f3aa3b814 alleggl-0.4.2.tar.bz2 -d3551545c7d17fe2a53aaadf1d3be212 alleggl-0.4.2-doxygen-docs.tar.gz +18733c5525e9af9c6b139759e0684ed9 alleggl-0.4.3.tar.bz2 From 4e03981715fd3c296f837130376b572d16a8f92a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 4 Jan 2008 20:45:16 +0000 Subject: [PATCH 09/19] - Fix headers to allow inclusion from c++ programs compiled with gcc 4.3 --- alleggl-0.4.2-gcc43.patch | 12 ++++++++++++ alleggl.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.2-gcc43.patch diff --git a/alleggl-0.4.2-gcc43.patch b/alleggl-0.4.2-gcc43.patch new file mode 100644 index 0000000..8c461b5 --- /dev/null +++ b/alleggl-0.4.2-gcc43.patch @@ -0,0 +1,12 @@ +diff -up alleggl/include/allegrogl/GLext/gl_ext_api.h~ alleggl/include/allegrogl/GLext/gl_ext_api.h +--- alleggl/include/allegrogl/GLext/gl_ext_api.h~ 2008-01-04 21:39:04.000000000 +0100 ++++ alleggl/include/allegrogl/GLext/gl_ext_api.h 2008-01-04 21:39:04.000000000 +0100 +@@ -1824,7 +1824,7 @@ AGL_API(void, BindBufferBaseNV, (GLenum + AGL_API(void, TransformFeedbackAttribsNV, (GLsizei, const GLint *, GLenum)) + AGL_API(void, TransformFeedbackVaryingsNV,(GLuint, GLsizei, const GLint *, GLenum)) + AGL_API(void, BeginTransformFeedbackNV, (GLenum)) +-AGL_API(void, EndTransformFeedbackNV, (GLvoid)) ++AGL_API(void, EndTransformFeedbackNV, (void)) + AGL_API(GLint, GetVaryingLocationNV, (GLuint, const GLchar *)) + AGL_API(void, GetActiveVaryingNV, (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) + AGL_API(void, ActiveVaryingNV, (GLuint, const GLchar *)) diff --git a/alleggl.spec b/alleggl.spec index a284bd7..e827871 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,11 +1,12 @@ Name: alleggl Version: 0.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 +Patch0: alleggl-0.4.2-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -35,6 +36,7 @@ developing applications that use %{name}. %prep %setup -q -n %{name} +%patch0 -p1 %build @@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 4 2007 Hans de Goede 0.4.3-2 +- Fix headers to allow inclusion from c++ programs compiled with gcc 4.3 + * Sun Nov 11 2007 Hans de Goede 0.4.3-1 - New upstream release 0.4.3 - Drop prebuild doxygen Source as upstream now includes prebuild doxygen docs From a18d1f7fd48b00129a928b292a52e293199f1a65 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 15 Feb 2008 14:05:02 +0000 Subject: [PATCH 10/19] - Upstream has done a new (respin) release without bumping the version GRR - Rebuild for gcc 4.3 --- alleggl.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alleggl.spec b/alleggl.spec index e827871..260794e 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 15 2008 Hans de Goede 0.4.3-3 +- Upstream has done a new (respin) release without bumping the version GRR +- Rebuild for gcc 4.3 + * Fri Dec 4 2007 Hans de Goede 0.4.3-2 - Fix headers to allow inclusion from c++ programs compiled with gcc 4.3 diff --git a/sources b/sources index 4385c59..5037554 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18733c5525e9af9c6b139759e0684ed9 alleggl-0.4.3.tar.bz2 +de84c6ab982499501940854893ea0dbd alleggl-0.4.3.tar.bz2 From 4b4a49aca051f14bd7ff777a39226978a3930873 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:36:13 +0000 Subject: [PATCH 11/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- alleggl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alleggl.spec b/alleggl.spec index 260794e..505a8ad 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 15 2008 Hans de Goede 0.4.3-3 - Upstream has done a new (respin) release without bumping the version GRR - Rebuild for gcc 4.3 From 41fcef960a8b404df6794fd8e96237f9811a8501 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:43:58 +0000 Subject: [PATCH 12/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- alleggl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alleggl.spec b/alleggl.spec index 505a8ad..43da54e 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 0.4.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From a805759f79b3944fd27fc776349958b315b3e013 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 10 Sep 2009 20:40:19 +0000 Subject: [PATCH 13/19] - Fix (workaround) viewport issues in fullscreen mode (#522116) --- alleggl-0.4.3-fullscreen-viewport.patch | 18 ++++++++++++++++++ alleggl.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.3-fullscreen-viewport.patch diff --git a/alleggl-0.4.3-fullscreen-viewport.patch b/alleggl-0.4.3-fullscreen-viewport.patch new file mode 100644 index 0000000..50842a0 --- /dev/null +++ b/alleggl-0.4.3-fullscreen-viewport.patch @@ -0,0 +1,18 @@ +diff -up alleggl/src/x.c~ alleggl/src/x.c +--- alleggl/src/x.c~ 2007-09-18 22:36:28.000000000 +0200 ++++ alleggl/src/x.c 2009-09-10 22:09:01.000000000 +0200 +@@ -1005,6 +1005,14 @@ old_choose_visual: + #ifdef ALLEGROGL_HAVE_XF86VIDMODE + if (fullscreen) { + setattr.override_redirect = True; ++ ++ /* 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 is always be centered at the last mouse position */ ++ XWarpPointer(_xwin.display, None, ++ XDefaultRootWindow(_xwin.display), ++ 0, 0, 0, 0, 0, 0); + if (!XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, + _xwin.modesinfo[bestmode])) { + diff --git a/alleggl.spec b/alleggl.spec index 43da54e..f7f5b5d 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,12 +1,13 @@ Name: alleggl Version: 0.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 Patch0: alleggl-0.4.2-gcc43.patch +Patch1: alleggl-0.4.3-fullscreen-viewport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -37,6 +38,7 @@ developing applications that use %{name}. %prep %setup -q -n %{name} %patch0 -p1 +%patch1 -p1 %build @@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 10 2009 Hans de Goede 0.4.3-6 +- Fix (workaround) viewport issues in fullscreen mode (#522116) + * Fri Jul 24 2009 Fedora Release Engineering - 0.4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 27f855ddb30a9d23aa583901d7ca261d45ff26c3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:09 +0000 Subject: [PATCH 14/19] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7302488..2b97444 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := alleggl SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e86d057675ba132a4e97995493692a2f6f968943 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:34 +0000 Subject: [PATCH 15/19] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2b97444..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alleggl -# $Id$ -NAME := alleggl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 1c4a1cd28565242e6cb3073030aa6e854d0e305a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 10 Sep 2010 09:29:22 +0200 Subject: [PATCH 16/19] - Fix FTBFS (#631146) --- alleggl-0.4.3-make.patch | 99 ++++++++++++++++++++++++++++++++++++++++ alleggl.spec | 7 ++- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.3-make.patch diff --git a/alleggl-0.4.3-make.patch b/alleggl-0.4.3-make.patch new file mode 100644 index 0000000..9bbe8d8 --- /dev/null +++ b/alleggl-0.4.3-make.patch @@ -0,0 +1,99 @@ +diff -up alleggl/make/makefile.all~ alleggl/make/makefile.all +--- alleggl/make/makefile.all~ 2007-01-06 21:39:09.000000000 +0100 ++++ alleggl/make/makefile.all 2010-09-10 09:14:33.192573997 +0200 +@@ -47,7 +47,6 @@ ifeq ($(DATA_INSTALLER),) + PROG_INSTALLER=cp + endif + +-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) + ifdef UNIX_TOOLS + define CP_INSTALL + $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +@@ -59,6 +58,31 @@ ifdef UNIX_TOOLS + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) + ) + endef ++ define RM_UNINSTALL ++ $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) ++ ) ++ $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) ++ ) ++ $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) ++ ) ++ endef ++else ++ define CP_INSTALL ++ $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) ++ ) ++ $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) ++ ) ++ endef ++ define RM_UNINSTALL ++ $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) ++ ) ++ $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) ++ ) ++ endef ++endif ++ ++install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) ++ifdef UNIX_TOOLS + ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),) + mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl + endif +@@ -73,12 +97,6 @@ ifdef UNIX_TOOLS + - $(INSTALL_LINK) + - $(LDCONFIG) + else +- define CP_INSTALL +- $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) +- ) +- $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) +- ) +- endef + - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl + - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl\GLext + - $(CP_INSTALL) +@@ -89,25 +107,11 @@ endif + + uninstall: + ifdef UNIX_TOOLS +- define RM_UNINSTALL +- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) +- ) +- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- endef + - rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U)) + - $(RM_UNINSTALL) + - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext + - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl + else +- define RM_UNINSTALL +- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- endef + - $(RM_UNINSTALL) + - rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl + - del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U)) +diff -up alleggl/make/makefile.unx~ alleggl/make/makefile.unx +--- alleggl/make/makefile.unx~ 2007-11-10 20:33:06.000000000 +0100 ++++ alleggl/make/makefile.unx 2010-09-10 09:24:30.423574002 +0200 +@@ -149,11 +149,12 @@ distlist: + + include make/makefile.dep + +-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + define MAKE_LINKS + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link) + ) + endef ++ ++$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + $(LIB_BUILDER) $@ $^ + - $(MAKE_LINKS) + diff --git a/alleggl.spec b/alleggl.spec index f7f5b5d..7a70336 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -8,6 +8,7 @@ URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 Patch0: alleggl-0.4.2-gcc43.patch Patch1: alleggl-0.4.3-fullscreen-viewport.patch +Patch2: alleggl-0.4.3-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -39,6 +40,7 @@ developing applications that use %{name}. %setup -q -n %{name} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 10 2010 Hans de Goede 0.4.3-7 +- Fix FTBFS (#631146) + * Thu Sep 10 2009 Hans de Goede 0.4.3-6 - Fix (workaround) viewport issues in fullscreen mode (#522116) From 67733e811880b67e8f1e5af0480c2ea231051f99 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 1 Dec 2010 08:53:45 +0100 Subject: [PATCH 17/19] - Fix crash when libGL reports a NULL rendering string (#658758) --- alleggl-0.4.3-rhbz658758.patch | 16 ++++++++++++++++ alleggl.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.3-rhbz658758.patch diff --git a/alleggl-0.4.3-rhbz658758.patch b/alleggl-0.4.3-rhbz658758.patch new file mode 100644 index 0000000..6613829 --- /dev/null +++ b/alleggl-0.4.3-rhbz658758.patch @@ -0,0 +1,16 @@ +diff -up alleggl/src/glext.c~ alleggl/src/glext.c +--- alleggl/src/glext.c~ 2007-05-15 15:37:46.000000000 +0200 ++++ alleggl/src/glext.c 2010-12-01 08:51:23.631386748 +0100 +@@ -450,6 +450,12 @@ static void __fill_in_info_struct(const + struct allegro_gl_info *info) { + const char *renderer = (const char*)rendereru; + ++ /* The render string can be NULL ?? See: ++ https://bugzilla.redhat.com/show_bug.cgi?id=658758 */ ++ if (renderer == NULL) { ++ renderer = "foobar"; ++ } ++ + /* Some cards are "special"... */ + if (strstr(renderer, "3Dfx/Voodoo")) { + info->is_voodoo = 1; diff --git a/alleggl.spec b/alleggl.spec index 7a70336..a6fedd4 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.ta Patch0: alleggl-0.4.2-gcc43.patch Patch1: alleggl-0.4.3-fullscreen-viewport.patch Patch2: alleggl-0.4.3-make.patch +Patch3: alleggl-0.4.3-rhbz658758.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -41,6 +42,7 @@ developing applications that use %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 1 2010 Hans de Goede 0.4.3-8 +- Fix crash when libGL reports a NULL rendering string (#658758) + * Fri Sep 10 2010 Hans de Goede 0.4.3-7 - Fix FTBFS (#631146) From 087ddcff6116fc53d6baed98a73ff4b4538c4f0a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:51:56 -0600 Subject: [PATCH 18/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- alleggl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alleggl.spec b/alleggl.spec index a6fedd4..933a925 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.4.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Dec 1 2010 Hans de Goede 0.4.3-8 - Fix crash when libGL reports a NULL rendering string (#658758) From 5be30a25dcfa00cd60a3d1447e128debbec85e04 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 13 Jul 2011 10:22:53 +0200 Subject: [PATCH 19/19] alleggl is now part of / bundled with allegro itself --- .gitignore | 1 - alleggl-0.4.2-gcc43.patch | 12 -- alleggl-0.4.3-fullscreen-viewport.patch | 18 --- alleggl-0.4.3-make.patch | 99 --------------- alleggl-0.4.3-rhbz658758.patch | 16 --- alleggl.spec | 156 ------------------------ dead.package | 1 + sources | 1 - 8 files changed, 1 insertion(+), 303 deletions(-) delete mode 100644 .gitignore delete mode 100644 alleggl-0.4.2-gcc43.patch delete mode 100644 alleggl-0.4.3-fullscreen-viewport.patch delete mode 100644 alleggl-0.4.3-make.patch delete mode 100644 alleggl-0.4.3-rhbz658758.patch delete mode 100644 alleggl.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 85371d0..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -alleggl-0.4.3.tar.bz2 diff --git a/alleggl-0.4.2-gcc43.patch b/alleggl-0.4.2-gcc43.patch deleted file mode 100644 index 8c461b5..0000000 --- a/alleggl-0.4.2-gcc43.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up alleggl/include/allegrogl/GLext/gl_ext_api.h~ alleggl/include/allegrogl/GLext/gl_ext_api.h ---- alleggl/include/allegrogl/GLext/gl_ext_api.h~ 2008-01-04 21:39:04.000000000 +0100 -+++ alleggl/include/allegrogl/GLext/gl_ext_api.h 2008-01-04 21:39:04.000000000 +0100 -@@ -1824,7 +1824,7 @@ AGL_API(void, BindBufferBaseNV, (GLenum - AGL_API(void, TransformFeedbackAttribsNV, (GLsizei, const GLint *, GLenum)) - AGL_API(void, TransformFeedbackVaryingsNV,(GLuint, GLsizei, const GLint *, GLenum)) - AGL_API(void, BeginTransformFeedbackNV, (GLenum)) --AGL_API(void, EndTransformFeedbackNV, (GLvoid)) -+AGL_API(void, EndTransformFeedbackNV, (void)) - AGL_API(GLint, GetVaryingLocationNV, (GLuint, const GLchar *)) - AGL_API(void, GetActiveVaryingNV, (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) - AGL_API(void, ActiveVaryingNV, (GLuint, const GLchar *)) diff --git a/alleggl-0.4.3-fullscreen-viewport.patch b/alleggl-0.4.3-fullscreen-viewport.patch deleted file mode 100644 index 50842a0..0000000 --- a/alleggl-0.4.3-fullscreen-viewport.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up alleggl/src/x.c~ alleggl/src/x.c ---- alleggl/src/x.c~ 2007-09-18 22:36:28.000000000 +0200 -+++ alleggl/src/x.c 2009-09-10 22:09:01.000000000 +0200 -@@ -1005,6 +1005,14 @@ old_choose_visual: - #ifdef ALLEGROGL_HAVE_XF86VIDMODE - if (fullscreen) { - setattr.override_redirect = True; -+ -+ /* 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 is always be centered at the last mouse position */ -+ XWarpPointer(_xwin.display, None, -+ XDefaultRootWindow(_xwin.display), -+ 0, 0, 0, 0, 0, 0); - if (!XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, - _xwin.modesinfo[bestmode])) { - diff --git a/alleggl-0.4.3-make.patch b/alleggl-0.4.3-make.patch deleted file mode 100644 index 9bbe8d8..0000000 --- a/alleggl-0.4.3-make.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up alleggl/make/makefile.all~ alleggl/make/makefile.all ---- alleggl/make/makefile.all~ 2007-01-06 21:39:09.000000000 +0100 -+++ alleggl/make/makefile.all 2010-09-10 09:14:33.192573997 +0200 -@@ -47,7 +47,6 @@ ifeq ($(DATA_INSTALLER),) - PROG_INSTALLER=cp - endif - --install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) - ifdef UNIX_TOOLS - define CP_INSTALL - $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) -@@ -59,6 +58,31 @@ ifdef UNIX_TOOLS - $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) - ) - endef -+ define RM_UNINSTALL -+ $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) -+ ) -+ $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) -+ ) -+ $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) -+ ) -+ endef -+else -+ define CP_INSTALL -+ $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) -+ ) -+ $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) -+ ) -+ endef -+ define RM_UNINSTALL -+ $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) -+ ) -+ $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) -+ ) -+ endef -+endif -+ -+install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) -+ifdef UNIX_TOOLS - ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),) - mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl - endif -@@ -73,12 +97,6 @@ ifdef UNIX_TOOLS - - $(INSTALL_LINK) - - $(LDCONFIG) - else -- define CP_INSTALL -- $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) -- ) -- $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) -- ) -- endef - - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl - - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl\GLext - - $(CP_INSTALL) -@@ -89,25 +107,11 @@ endif - - uninstall: - ifdef UNIX_TOOLS -- define RM_UNINSTALL -- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) -- ) -- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) -- ) -- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) -- ) -- endef - - rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U)) - - $(RM_UNINSTALL) - - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext - - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl - else -- define RM_UNINSTALL -- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) -- ) -- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) -- ) -- endef - - $(RM_UNINSTALL) - - rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl - - del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U)) -diff -up alleggl/make/makefile.unx~ alleggl/make/makefile.unx ---- alleggl/make/makefile.unx~ 2007-11-10 20:33:06.000000000 +0100 -+++ alleggl/make/makefile.unx 2010-09-10 09:24:30.423574002 +0200 -@@ -149,11 +149,12 @@ distlist: - - include make/makefile.dep - --$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) - define MAKE_LINKS - $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link) - ) - endef -+ -+$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) - $(LIB_BUILDER) $@ $^ - - $(MAKE_LINKS) - diff --git a/alleggl-0.4.3-rhbz658758.patch b/alleggl-0.4.3-rhbz658758.patch deleted file mode 100644 index 6613829..0000000 --- a/alleggl-0.4.3-rhbz658758.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up alleggl/src/glext.c~ alleggl/src/glext.c ---- alleggl/src/glext.c~ 2007-05-15 15:37:46.000000000 +0200 -+++ alleggl/src/glext.c 2010-12-01 08:51:23.631386748 +0100 -@@ -450,6 +450,12 @@ static void __fill_in_info_struct(const - struct allegro_gl_info *info) { - const char *renderer = (const char*)rendereru; - -+ /* The render string can be NULL ?? See: -+ https://bugzilla.redhat.com/show_bug.cgi?id=658758 */ -+ if (renderer == NULL) { -+ renderer = "foobar"; -+ } -+ - /* Some cards are "special"... */ - if (strstr(renderer, "3Dfx/Voodoo")) { - info->is_voodoo = 1; diff --git a/alleggl.spec b/alleggl.spec deleted file mode 100644 index 933a925..0000000 --- a/alleggl.spec +++ /dev/null @@ -1,156 +0,0 @@ -Name: alleggl -Version: 0.4.3 -Release: 9%{?dist} -Summary: OpenGL support library for Allegro -Group: System Environment/Libraries -License: zlib -URL: http://allegrogl.sourceforge.net/ -Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 -Patch0: alleggl-0.4.2-gcc43.patch -Patch1: alleggl-0.4.3-fullscreen-viewport.patch -Patch2: alleggl-0.4.3-make.patch -Patch3: alleggl-0.4.3-rhbz658758.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel -BuildRequires: libXpm-devel libXxf86vm-devel - -%description -AllegroGL is an Allegro add-on that allows you to use OpenGL alongside Allegro. -You use OpenGL for your rendering to the screen, and Allegro for miscellaneous -tasks like gathering input, doing timers, getting cross-platform portability, -loading data, and drawing your textures. So this library fills the same hole -that things like glut do. - -AllegroGL also automatically exposes most, if not all, OpenGL extensions -available to user programs. This means you no longer have to manually load -them; extension management is already done for you. - - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: allegro-devel libGL-devel - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%prep -%setup -q -n %{name} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - - -%build -# the --with-x-foo is there so that configure doesn't add -L/usr/lib to -# the LDFLAGS, as that will result in an installed older alleggl getting used -# during the linking of the examples, possibly resulting in an error -%configure --disable-static --x-includes='' --x-libraries='' -make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ - CFLAGS="$RPM_OPT_FLAGS -ffast-math" - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -# alleggl installs an autoheader generated header file which could very -# well conflict with other autoheader generated header files, so we override -# this with our own version which contains only the bare minimum: -echo '#define ALLEGROGL_HAVE_DYNAMIC_LINK 1' \ - > $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h -echo '#define ALLEGROGL_HAVE_XF86VIDMODE 1' \ - >> $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h - -# we don't want these files to end up under %%doc and there is no way -# to %%exclude files from %%doc, so we remove them -rm docs/html/index.hh? - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc bugs.txt todo.txt -%{_libdir}/libagl.so.0* - -%files devel -%defattr(-,root,root,-) -%doc extensions.txt faq.txt howto.txt quickstart.txt docs/html -%{_includedir}/* -%{_libdir}/libagl.so - - -%changelog -* Mon Feb 07 2011 Fedora Release Engineering - 0.4.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 1 2010 Hans de Goede 0.4.3-8 -- Fix crash when libGL reports a NULL rendering string (#658758) - -* Fri Sep 10 2010 Hans de Goede 0.4.3-7 -- Fix FTBFS (#631146) - -* Thu Sep 10 2009 Hans de Goede 0.4.3-6 -- Fix (workaround) viewport issues in fullscreen mode (#522116) - -* Fri Jul 24 2009 Fedora Release Engineering - 0.4.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 0.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 15 2008 Hans de Goede 0.4.3-3 -- Upstream has done a new (respin) release without bumping the version GRR -- Rebuild for gcc 4.3 - -* Fri Dec 4 2007 Hans de Goede 0.4.3-2 -- Fix headers to allow inclusion from c++ programs compiled with gcc 4.3 - -* Sun Nov 11 2007 Hans de Goede 0.4.3-1 -- New upstream release 0.4.3 -- Drop prebuild doxygen Source as upstream now includes prebuild doxygen docs - -* Sun Oct 21 2007 Hans de Goede 0.4.2-2 -- Some cleanups to the multilib doxygen documentation bugfix - -* Sun Oct 21 2007 Hans de Goede 0.4.2-1 -- Upstream has renamed rc1 to final, so drop the .rc1 from the release field -- Fix multilib conflicts in doxygen documentation (bz 340611) - -* Thu Aug 2 2007 Hans de Goede 0.4.2-0.2.rc1 -- Update License tag for new Licensing Guidelines compliance - -* Sun Jun 3 2007 Hans de Goede 0.4.1-1 -- New upstream release 0.4.1 final - -* Wed Dec 13 2006 Hans de Goede 0.4.0-1 -- New upstream release 0.4.0 final - -* Mon Aug 28 2006 Hans de Goede 0.4.0-0.5.rc4 -- FE6 Rebuild - -* Thu Aug 10 2006 Hans de Goede 0.4.0-0.4.rc4 -- Cleanup %%doc for both base and -devel a bit - -* Fri Aug 4 2006 Hans de Goede 0.4.0-0.3.rc4 -- Add missing BRs: libXext-devel and libXpm-devel - -* Thu Aug 3 2006 Hans de Goede 0.4.0-0.2.rc4 -- Replace installed autoheader generated header file with our own version - which contains only the nescesarry alleggl specific defines, thus avoiding - possible conflicts with other autoheader generated headers. - -* Thu Aug 3 2006 Hans de Goede 0.4.0-0.1.rc4 -- Initial Fedora Extras package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e17dda2 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +alleggl is now part of / bundled with allegro itself \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 5037554..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -de84c6ab982499501940854893ea0dbd alleggl-0.4.3.tar.bz2