[Pkg-sdl-commits] r86 - in experimental: . sdlperl sdlperl/debian
sdlperl/debian/patches
Aurelien Jarno
aurel32 at costa.debian.org
Mon Aug 7 16:53:32 UTC 2006
Author: aurel32
Date: 2006-08-07 16:53:32 +0000 (Mon, 07 Aug 2006)
New Revision: 86
Added:
experimental/sdlperl/
experimental/sdlperl/debian/
experimental/sdlperl/debian/changelog
experimental/sdlperl/debian/compat
experimental/sdlperl/debian/control
experimental/sdlperl/debian/copyright
experimental/sdlperl/debian/dirs
experimental/sdlperl/debian/docs
experimental/sdlperl/debian/patches/
experimental/sdlperl/debian/patches/001_kfreebsd.diff
experimental/sdlperl/debian/patches/010_fontpath.diff
experimental/sdlperl/debian/patches/020_fixexamples.diff
experimental/sdlperl/debian/patches/030_glu_nurbs.diff
experimental/sdlperl/debian/patches/030_opengl_fixes.diff
experimental/sdlperl/debian/patches/series
experimental/sdlperl/debian/rules
Log:
* New upstream version targetted to experimental (Closes: #362974).
* debian/control:
+ Bumped Standards-Version to 3.7.2 (no changes).
+ Build-depend on libmodule-build-perl.
+ Build-depend on libtest-simple-perl.
+ Removed build-depend on libsdl-console-dev.
* debian/rules:
+ Modified to the use the new build system.
* debian/patches/001_kfreebsd.diff:
+ Updated for new version.
* debian/patches/010_fontpath.diff:
+ Rediffed.
* debian/patches/020_fixexamples.diff:
+ Old patch: stripped merged part.
* debian/patches/030_backwards_compatibility.diff:
+ Removed (anyway this version breaks the ABI).
* debian/patches/030_glu_nurbs.diff:
+ Rediffed.
* debian/patches/030_opengl_fixes.diff:
+ Rediffed.
* debian/patches/030_sdl_console.diff:
+ Removed.
Added: experimental/sdlperl/debian/changelog
===================================================================
--- experimental/sdlperl/debian/changelog 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/changelog 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,250 @@
+sdlperl (2.1.2-1) experimental; urgency=low
+
+ * New upstream version targetted to experimental (Closes: #362974).
+
+ * debian/control:
+ + Bumped Standards-Version to 3.7.2 (no changes).
+ + Build-depend on libmodule-build-perl.
+ + Build-depend on libtest-simple-perl.
+ + Removed build-depend on libsdl-console-dev.
+
+ * debian/rules:
+ + Modified to the use the new build system.
+
+ * debian/patches/001_kfreebsd.diff:
+ + Updated for new version.
+
+ * debian/patches/010_fontpath.diff:
+ + Rediffed.
+
+ * debian/patches/020_fixexamples.diff:
+ + Old patch: stripped merged part.
+
+ * debian/patches/030_backwards_compatibility.diff:
+ + Removed (anyway this version breaks the ABI).
+
+ * debian/patches/030_glu_nurbs.diff:
+ + Rediffed.
+
+ * debian/patches/030_opengl_fixes.diff:
+ + Rediffed.
+
+ * debian/patches/030_sdl_console.diff:
+ + Removed.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 27 May 2006 03:11:41 +0200
+
+sdlperl (1.20.3-4) unstable; urgency=low
+
+ * Moved development to the pkg-sdl Alioth project.
+
+ * debian/rules:
+ + Use quilt for patch management.
+ * debian/control:
+ + Build-depend on quilt.
+ + Set the SDL team as the maintainer and added its members to the
+ uploaders field.
+ + Build-depend on libsdl-gfx1.2-dev (>= 2.0.13-1) to make libsdl-perl
+ installable again (Closes: #343624).
+ + Build-depend on debhelper (>= 4.0).
+ * debian/compat:
+ + Set compat level to 4.
+
+ * debian/patches/001_kfreebsd.diff:
+ + Old patch: kFreeBSD support.
+
+ * debian/patches/010_fontpath.diff:
+ + Old patch: fix font paths in examples.
+
+ * debian/patches/020_fixexamples.diff:
+ + Old patch: fix examples so that they match the latest API.
+
+ * debian/patches/030_backwards_compatibility.diff:
+ + Old patch: backwards compatibility fix so as not to break frozen-bubble.
+
+ * debian/patches/030_glu_nurbs.diff:
+ + Old patch: activate NURBS support.
+
+ * debian/patches/030_opengl_fixes.diff:
+ + Old patch by Geoffrey Broadwell for erroneous use of SvNOK and an
+ off-by-one error.
+
+ * debian/patches/030_sdl_console.diff:
+ + Old patch for SDL_console support.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 1 Mar 2006 20:31:21 +0100
+
+sdlperl (1.20.3-3) unstable; urgency=low
+
+ * Makefile.PL:
+ + Fixed wrongly applied patch (Closes: #319955).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 5 Oct 2005 17:33:53 +0200
+
+sdlperl (1.20.3-2) unstable; urgency=low
+
+ * Acknowledge NMU by Graham Wilson (Closes: #320548, #322435). Thank you.
+ * debian/control:
+ + Set policy to 3.6.2.1.
+ + Build-depend on libpng12-dev (Closes: #303703).
+ * debian/copyright:
+ + Updated the FSF address.
+ * Makefile.PL:
+ + Support for GNU/kFreeBSD, thanks to Aurélien Jarno (Closes: #319955).
+ * OpenGL.xs:
+ + Applied patch by Geoffrey Broadwell for erroneous use of SvNOK and an
+ off-by-one error (Closes: #275769).
+ + Re-enabled GLU NURBS (Closes: #297532).
+ * test/OpenGL/tutorial:
+ + Brought OpenGL tutorial samples in sync with the API (Closes: #297533).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 5 Oct 2005 10:37:08 +0200
+
+sdlperl (1.20.3-1.1) unstable; urgency=medium
+
+ * NMU with maintainer permission.
+ * Rebuild for the C++ transition. (closes: #320548)
+
+ -- Graham Wilson <graham at debian.org> Wed, 10 Aug 2005 04:18:42 +0000
+
+sdlperl (1.20.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #243850).
+ * debian/control:
+ + Conflict with old versions of frozen-bubble which blindly poke into our
+ internal structures.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 1 Jun 2004 21:44:39 +0200
+
+sdlperl (1.20.0-12) unstable; urgency=low
+
+ * Rebuilt against latest libpng to get versioned symbols.
+ * debian/control:
+ + Updated libpng3-dev build-dependency to (>= 1.2.5.0-4).
+ + Set policy to 3.6.0. No changes required.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 17 Jul 2003 12:19:12 +0200
+
+sdlperl (1.20.0-11) unstable; urgency=low
+
+ * debian/control:
+ + We build-depend on libsdl-console-dev (>= 1.3-2.2) because previous
+ versions did not have an soname. SDL::Console* works at last.
+ + Removed the additional dependency on libsdl-console because the new
+ libsdl-console-dev has proper shlib information.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 10 Jun 2003 05:59:04 +0200
+
+sdlperl (1.20.0-10) unstable; urgency=low
+
+ * Removed hardcoded "gcc-3.2" in debian/rules.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 30 May 2003 18:16:52 +0200
+
+sdlperl (1.20.0-9) unstable; urgency=low
+
+ * Updated the dependency on libsdl-console because older versions do not
+ provide the .so.1 link (Closes: #194047, #194009).
+ * Updated policy to 3.5.10.0.
+
+ -- Samuel Hocevar <sam at zoy.org> Tue, 20 May 2003 19:24:46 +0200
+
+sdlperl (1.20.0-8) unstable; urgency=low
+
+ * Changed the section to perl.
+ * Fixed our monthly frozen-bubble breakage by forcing final linking with
+ g++ to avoid undefined libstdc++ symbols (Closes: #192071).
+
+ -- Samuel Hocevar <sam at zoy.org> Tue, 6 May 2003 03:18:30 +0200
+
+sdlperl (1.20.0-7) unstable; urgency=low
+
+ * Fucked up upload.
+
+ -- Samuel Hocevar <sam at zoy.org> Tue, 6 May 2003 03:18:30 +0200
+
+sdlperl (1.20.0-6) unstable; urgency=low
+
+ * Activated linking against xlibmesa-glu-dev.
+
+ -- Samuel Hocevar <sam at zoy.org> Tue, 18 Mar 2003 03:28:17 +0100
+
+sdlperl (1.20.0-5) unstable; urgency=low
+
+ * Updated build dependency on libsdl-mixer1.2-dev so that we depend on the
+ correct libvorbis.
+
+ -- Samuel Hocevar <sam at zoy.org> Mon, 17 Mar 2003 20:52:55 +0100
+
+sdlperl (1.20.0-4) unstable; urgency=low
+
+ * Updated standards-version.
+ * Changed build dependency on libgl-dev to xlibmesa-gl-dev to make the
+ autobuilder happy.
+
+ -- Samuel Hocevar <sam at zoy.org> Sat, 15 Mar 2003 15:25:21 +0100
+
+sdlperl (1.20.0-3) unstable; urgency=low
+
+ * Added a dependency on libsdl-console (Closes: #184429, #184497).
+
+ -- Samuel Hocevar <sam at zoy.org> Fri, 14 Mar 2003 17:34:02 +0100
+
+sdlperl (1.20.0-2) unstable; urgency=low
+
+ * Activated SDL::Console.
+ * Rebuilt against libsdl-gfx to activate SDL::GraphicTool.
+ * Rebuilt against libsdl-ttf 2.0.
+ * Checked all test scripts.
+ * Applied a patch preventing crashes in SDL::Delay.
+
+ -- Samuel Hocevar <sam at zoy.org> Tue, 11 Feb 2003 15:20:42 +0100
+
+sdlperl (1.20.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #179607).
+ * Acknowledged -3.4 NMU (Closes: #159921).
+
+ -- Samuel Hocevar <sam at zoy.org> Sat, 8 Feb 2003 03:52:07 +0100
+
+sdlperl (1.16-3.4) unstable; urgency=low
+
+ * NMU
+ * HPPA needs -ffunction-sections before it can build -3.3. Closes: #159921
+
+ -- LaMont Jones <lamont at debian.org> Sun, 13 Oct 2002 18:23:00 -0600
+
+sdlperl (1.16-3.3) unstable; urgency=low
+
+ * NMU for perl 5.8. No changes excpet build-dep on perl >= 5.8
+
+ -- Joey Hess <joeyh at debian.org> Wed, 31 Jul 2002 05:52:50 +0000
+
+sdlperl (1.16-3) unstable; urgency=low
+
+ * Changed libpng-dev build dependency to libpng3-dev.
+
+ -- Samuel Hocevar <sam at zoy.org> Wed, 24 Jul 2002 00:33:23 +0200
+
+sdlperl (1.16-2) unstable; urgency=low
+
+ * Built against libpng-dev (Closes: #153813).
+
+ -- Samuel Hocevar <sam at zoy.org> Wed, 24 Jul 2002 00:33:23 +0200
+
+sdlperl (1.16-1) unstable; urgency=low
+
+ * New upstream release.
+ * Includes fix for SDL_TEXTWIDTH segfault (Closes: #138908).
+ * Added sdl::sdl_display_format and sdl::sdl_free_surface for
+ backwards compatibility so that frozen-bubble still works.
+ * Included example programs (Closes: #140120).
+
+ -- Samuel Hocevar <sam at zoy.org> Mon, 8 Apr 2002 01:54:55 +0200
+
+sdlperl (1.12-1) unstable; urgency=low
+
+ * Initial Release (Closes: #132876).
+
+ -- Samuel Hocevar <sam at zoy.org> Mon, 4 Feb 2002 19:43:01 +0100
+
Added: experimental/sdlperl/debian/compat
===================================================================
--- experimental/sdlperl/debian/compat 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/compat 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1 @@
+4
Added: experimental/sdlperl/debian/control
===================================================================
--- experimental/sdlperl/debian/control 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/control 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,19 @@
+Source: sdlperl
+Section: perl
+Priority: optional
+Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
+Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
+Build-Depends: debhelper (>= 4.0), quilt, perl (>= 5.8), libmodule-build-perl, libtest-simple-perl, libsdl1.2-dev (>= 1.2.5-3), libsdl-image1.2-dev, libsdl-mixer1.2-dev (>= 1.2.5-2), libsdl-ttf2.0-dev, libsdl-gfx1.2-dev, libsdl-net1.2-dev
+Standards-Version: 3.7.2
+
+Package: libsdl-perl
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs:Depends}
+Suggests: ttf-freefont
+Conflicts: frozen-bubble
+Description: SDL bindings for the Perl language
+ SDL is a library that allows programs portable low level access to
+ a video framebuffer, audio output, mouse, and keyboard. This perl
+ package contains Perl bindings to access the SDL library.
+ .
+ This library exists at http://www.sdlperl.org/
Added: experimental/sdlperl/debian/copyright
===================================================================
--- experimental/sdlperl/debian/copyright 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/copyright 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,26 @@
+This package was debianized by Sam Hocevar <sam at zoy.org> on
+Mon, 4 Feb 2002 19:43:01 +0100.
+
+It was downloaded from http://www.sdlperl.org/SDL-sdlpl-1.12.tar.gz
+
+Upstream Authors: David J. Goehrig <dave at cthulhu-burger.org>
+ Wayne Keenan
+
+Copyright: (c) 2003 David J. Goehrig <dave at cthulhu-burger.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Library General
+Public License is found in `/usr/share/common-licenses/LGPL-2'.
Added: experimental/sdlperl/debian/dirs
===================================================================
--- experimental/sdlperl/debian/dirs 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/dirs 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,3 @@
+/usr/share/doc/libsdl-perl/test/data
+/usr/share/doc/libsdl-perl
+/usr/share/perl5/SDL
Added: experimental/sdlperl/debian/docs
===================================================================
--- experimental/sdlperl/debian/docs 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/docs 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,3 @@
+BUGS
+README
+TODO
Added: experimental/sdlperl/debian/patches/001_kfreebsd.diff
===================================================================
--- experimental/sdlperl/debian/patches/001_kfreebsd.diff 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/001_kfreebsd.diff 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,29 @@
+--- SDL_perl-1.20.3.orig/make/lib/SDL/Build/Gnukfreebsd.pm 2006-08-07 18:31:37.000000000 +0200
++++ SDL_perl-1.20.3/make/lib/SDL/Build/Gnukfreebsd.pm 2006-08-07 18:31:37.000000000 +0200
+@@ -0,0 +1,26 @@
++package SDL::Build::Gnukfreebsd;
++
++use base 'SDL::Build';
++
++sub fetch_includes
++{
++ return (
++ '/usr/local/include' => '/usr/local/lib',
++ '/usr/local/include/gl' => '/usr/local/lib',
++ '/usr/local/include/GL' => '/usr/local/lib',
++ '/usr/local/include/SDL' => '/usr/local/lib',
++ '/usr/local/include/smpeg' => '/usr/local/lib',
++
++ '/usr/include' => '/usr/lib',
++ '/usr/include/gl' => '/usr/lib',
++ '/usr/include/GL' => '/usr/lib',
++ '/usr/include/SDL' => '/usr/lib',
++ '/usr/include/smpeg' => '/usr/lib',
++
++ '/usr/X11R6/include' => '/usr/X11R6/lib',
++ '/usr/X11R6/include/gl' => '/usr/X11R6/lib',
++ '/usr/X11R6/include/GL' => '/usr/X11R6/lib',
++ );
++}
++
++1;
Added: experimental/sdlperl/debian/patches/010_fontpath.diff
===================================================================
--- experimental/sdlperl/debian/patches/010_fontpath.diff 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/010_fontpath.diff 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,46 @@
+diff -puriN SDL_perl-1.20.3/test/testfonttool.pl sdlperl-1.20.3/test/testfonttool.pl
+--- SDL_perl-1.20.3/test/testfonttool.pl 2003-03-12 05:58:08 +0100
++++ sdlperl-1.20.3/test/testfonttool.pl 2006-03-01 00:42:56 +0100
+ $app = new SDL::App %options;
+
+ my %ttfonts = (
+- 'aircut3.ttf' => 0,
+- 'electrohar.ttf' => 0,
++ '/usr/share/fonts/truetype/freefont/FreeSerif.ttf' => 0,
++ '/usr/share/fonts/truetype/freefont/FreeSans.ttf' => 0,
++ '/usr/share/fonts/truetype/freefont/FreeMono.ttf' => 0,
+ );
+
+ my %sfonts = (
+- '24P_Arial_NeonYellow.png' => 0,
+- '24P_Copperplate_Blue.png' => 0,
++ 'data/24P_Arial_NeonYellow.png' => 0,
++ 'data/24P_Copperplate_Blue.png' => 0,
+ );
+
+ my @fonts;
+
+ for ( reverse keys %ttfonts ) {
+ for $mode ( qw/ -normal -bold -italic -underline / ) {
+- if (-e "data/$_") {
++ if (-e "$_") {
+ print STDERR "Loading $_\n";
+ $ttfonts{"$_$mode"} = new SDL::Tool::Font
+ $mode => 1,
+- -ttfont => "data/$_",
++ -ttfont => "$_",
+ -size => 20,
+ -fg => $SDL::Color::black,
+ -bg => $SDL::Color::black;
+@@ -63,9 +64,9 @@
+ %ttfonts = reverse %ttfonts;
+
+ for ( reverse keys %sfonts) {
+- if (-e "data/$_") {
++ if (-e "$_") {
+ print STDERR "Loading $_\n";
+- $sfonts{$_} = new SDL::Tool::Font -sfont => "data/$_";
++ $sfonts{$_} = new SDL::Tool::Font -sfont => "$_";
+ push @fonts, $sfonts{$_};
+ }
+ }
Added: experimental/sdlperl/debian/patches/020_fixexamples.diff
===================================================================
--- experimental/sdlperl/debian/patches/020_fixexamples.diff 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/020_fixexamples.diff 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,40 @@
+diff -puriN SDL_perl-1.20.3/test/loopwave.pl sdlperl-1.20.3/test/loopwave.pl
+--- SDL_perl-1.20.3/test/loopwave.pl 2003-03-12 05:33:56 +0100
++++ sdlperl-1.20.3/test/loopwave.pl 2006-03-01 00:42:56 +0100
+@@ -1,9 +1,10 @@
+ #!/usr/bin/env perl
+
+ use SDL;
++use SDL::Event;
+
+ die "Could not initialize SDL: ", SDL::GetError()
+- if ( 0 > SDL::Init(SDL_INIT_AUDIO()));
++ if ( 0 > SDL::Init(SDL_INIT_AUDIO));
+
+ $ARGV[0] ||= 'data/sample.wav';
+
+@@ -56,7 +57,7 @@ SDL::PauseAudio(0);
+
+ print "Using audio driver: ", SDL::AudioDriverName(), "\n";
+
+-while (! $done && ( SDL::GetAudioStatus() == SDL_AUDIO_PLAYING())) {
++while (! $done && ( SDL::GetAudioStatus() == SDL_AUDIO_PLAYING)) {
+ SDL::Delay(1000);
+ }
+
+diff -puriN SDL_perl-1.20.3/test/testtimer.pl sdlperl-1.20.3/test/testtimer.pl
+--- SDL_perl-1.20.3/test/testtimer.pl 2003-03-12 07:00:29 +0100
++++ sdlperl-1.20.3/test/testtimer.pl 2006-03-01 00:42:56 +0100
+@@ -2,10 +2,11 @@
+
+ use SDL;
+ use SDL::Timer;
++use SDL::Event;
+
+ die "usage: $0\n" if in($ARGV[0], qw/ -? -h --help/);
+
+-SDL::Init(SDL_INIT_EVERYTHING());
++SDL::Init(SDL_INIT_TIMER);
+
+ print STDERR "Waiting 4 seconds\n";
+ SDL::Delay(4000);
Added: experimental/sdlperl/debian/patches/030_glu_nurbs.diff
===================================================================
--- experimental/sdlperl/debian/patches/030_glu_nurbs.diff 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/030_glu_nurbs.diff 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,11 @@
+--- SDL_Perl-2.1.2.orig/src/OpenGL.xs 2006-08-07 09:14:51.000000000 +0200
++++ SDL_Perl-2.1.2/src/OpenGL.xs 2006-08-07 09:15:06.000000000 +0200
+@@ -23,6 +23,8 @@
+ #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF
+ #endif /* GL_ALL_CLIENT_BITS */
+
++#define GL_HAS_NURBS
++
+ #include "../defines.h"
+
+ SV* sdl_perl_nurbs_error_hook;
Added: experimental/sdlperl/debian/patches/030_opengl_fixes.diff
===================================================================
--- experimental/sdlperl/debian/patches/030_opengl_fixes.diff 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/030_opengl_fixes.diff 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,62 @@
+--- SDL_Perl-2.1.2.orig/src/OpenGL.xs 2006-08-07 09:08:33.000000000 +0200
++++ SDL_Perl-2.1.2/src/OpenGL.xs 2006-08-07 09:08:57.000000000 +0200
+@@ -910,7 +910,7 @@
+ int i;
+ double mat[16];
+ for ( i = 0; i < 16; i++ ) {
+- mat[i] = (i < items && SvNOK(ST(i)) ? SvNV(ST(i)) : 0.0 );
++ mat[i] = i < items ? SvNV(ST(i)) : 0.0;
+ }
+ glLoadMatrixd(mat);
+
+@@ -920,7 +920,7 @@
+ int i;
+ double mat[16];
+ for ( i = 0; i < 16; i++ ) {
+- mat[i] = (i < items && SvNOK(ST(i)) ? SvNV(ST(i)) : 0.0 );
++ mat[i] = i < items ? SvNV(ST(i)) : 0.0;
+ }
+ glMultMatrixd(mat);
+
+@@ -1004,7 +1004,7 @@
+ double v[4];
+ int i;
+ for (i = 0; i < 4; i++ ) {
+- v[i] = (i+1 < items && SvNOK(ST(i+1))) ? SvNV(ST(i+1)) : 0.0;
++ v[i] = i+1 < items ? SvNV(ST(i+1)) : 0.0;
+ }
+ glClipPlane(plane,v);
+
+@@ -1043,13 +1043,13 @@
+ if ( items == 6 ) {
+ float v[4];
+ for ( i = 0; i < 4; i++ ) {
+- v[i] = (SvNOK(ST(i+2))) ? SvNV(ST(i+2)) : 0.0;
++ v[i] = SvNV(ST(i+2));
+ }
+ glLightfv(light,name,v);
+ } else if ( items == 5 ) {
+ float v[3];
+ for ( i = 0; i < 3; i++ ) {
+- v[i] = (SvNOK(ST(i+2))) ? SvNV(ST(i+2)) : 0.0;
++ v[i] = SvNV(ST(i+2));
+ }
+ glLightfv(light,name,v);
+ } else if ( items == 3 ) {
+@@ -1088,13 +1088,13 @@
+ if ( items == 6 ) {
+ float v[4];
+ for ( i = 0; i < 4; i++ ) {
+- v[i] = (SvNOK(ST(i+2))) ? SvNV(ST(i+2)) : 0.0;
++ v[i] = SvNV(ST(i+2));
+ }
+ glMaterialfv(face,name,v);
+ } else if ( items == 5 ) {
+ float v[3];
+- for ( i = 0; i < 4; i++ ) {
+- v[i] = (SvNOK(ST(i+2))) ? SvNV(ST(i+2)) : 0.0;
++ for ( i = 0; i < 3; i++ ) {
++ v[i] = SvNV(ST(i+2));
+ }
+ glMaterialfv(face,name,v);
+ } else if ( items == 3 ) {
Added: experimental/sdlperl/debian/patches/series
===================================================================
--- experimental/sdlperl/debian/patches/series 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/patches/series 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,8 @@
+001_kfreebsd.diff -p1
+
+010_fontpath.diff -p1
+
+020_fixexamples.diff -p1
+
+030_glu_nurbs.diff -p1
+030_opengl_fixes.diff -p1
Added: experimental/sdlperl/debian/rules
===================================================================
--- experimental/sdlperl/debian/rules 2006-07-20 12:20:10 UTC (rev 85)
+++ experimental/sdlperl/debian/rules 2006-08-07 16:53:32 UTC (rev 86)
@@ -0,0 +1,96 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifeq (hppa,$(DEB_BUILD_ARCH))
+CC="gcc -ffunction-sections"
+else
+CC="gcc"
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+ # Configure the package and make sure we link with g++
+ perl Build.PL --config cc=$(CC) --config ld=g++
+
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ ./Build
+ -./Build test
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+
+ -./Build realclean
+ rm -f lib/SDL/Config.pm
+ rm -f build-stamp configure-stamp
+
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ ./Build install installdirs=vendor destdir=$(CURDIR)/debian/libsdl-perl
+
+ # Install examples
+ cp test/*.pl `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/
+ cp -a test/data `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/
+ rm -f `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/data/*ttf
+ cp -a test/OpenGL `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/
+
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installmenu -i
+ dh_installcron -i
+ dh_installinfo -i
+ dh_installchangelogs CHANGELOG -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installinfo -a
+ dh_installchangelogs CHANGELOG -a
+ dh_strip -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_perl -a usr/lib/perl5
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: experimental/sdlperl/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-sdl-commits
mailing list