[Pkg-sdl-commits] r234 - in unstable/sdlperl/debian: . patches
Ryan Niebur
ryan at alioth.debian.org
Sat Sep 26 09:17:48 UTC 2009
Author: ryan
Date: 2009-09-26 21:17:48 +0000 (Sat, 26 Sep 2009)
New Revision: 234
Removed:
unstable/sdlperl/debian/patches/001_kfreebsd.diff
unstable/sdlperl/debian/patches/020_fixexamples.diff
unstable/sdlperl/debian/patches/030_opengl_fixes.diff
unstable/sdlperl/debian/patches/040_sprintf.diff
unstable/sdlperl/debian/patches/050_pod2man_fixes.diff
unstable/sdlperl/debian/patches/060_fix_example.diff
Modified:
unstable/sdlperl/debian/changelog
unstable/sdlperl/debian/patches/030_glu_nurbs.diff
unstable/sdlperl/debian/patches/series
Log:
* New upstream version
* remove 001_kfreebsd.diff, 020_fixexamples.diff,
030_opengl_fixes.diff, 040_sprintf.diff, 050_pod2man_fixes.diff, and
060_fix_example.diff ... all applied upstream
Modified: unstable/sdlperl/debian/changelog
===================================================================
--- unstable/sdlperl/debian/changelog 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/changelog 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,8 +1,12 @@
-sdlperl (2.2.2.11-2) UNRELEASED; urgency=low
+sdlperl (2.2.2.17-1) UNRELEASED; urgency=low
* update my email address
+ * New upstream version
+ * remove 001_kfreebsd.diff, 020_fixexamples.diff,
+ 030_opengl_fixes.diff, 040_sprintf.diff, 050_pod2man_fixes.diff, and
+ 060_fix_example.diff ... all applied upstream
- -- Ryan Niebur <ryan at debian.org> Sat, 26 Sep 2009 14:09:59 -0700
+ -- Ryan Niebur <ryan at debian.org> Sat, 26 Sep 2009 14:17:01 -0700
sdlperl (2.2.2.11-1) unstable; urgency=low
Deleted: unstable/sdlperl/debian/patches/001_kfreebsd.diff
===================================================================
--- unstable/sdlperl/debian/patches/001_kfreebsd.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/001_kfreebsd.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,29 +0,0 @@
---- /dev/null
-+++ b/make/lib/SDL/Build/Gnukfreebsd.pm
-@@ -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;
Deleted: unstable/sdlperl/debian/patches/020_fixexamples.diff
===================================================================
--- unstable/sdlperl/debian/patches/020_fixexamples.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/020_fixexamples.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,39 +0,0 @@
---- a/test/loopwave.pl
-+++ b/test/loopwave.pl
-@@ -1,10 +1,11 @@
- #!/usr/bin/env perl
-
- use SDL;
-+use SDL::Event;
- use Carp;
-
- croak "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';
-
-@@ -57,7 +58,7 @@
-
- print "Using audio driver: ", SDL::AudioDriverName(), "\n";
-
--while (! $done && ( SDL::GetAudioStatus() == SDL_AUDIO_PLAYING())) {
-+while (! $done && ( SDL::GetAudioStatus() == SDL_AUDIO_PLAYING)) {
- SDL::Delay(1000);
- }
-
---- a/test/testtimer.pl
-+++ b/test/testtimer.pl
-@@ -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);
Modified: unstable/sdlperl/debian/patches/030_glu_nurbs.diff
===================================================================
--- unstable/sdlperl/debian/patches/030_glu_nurbs.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/030_glu_nurbs.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,9 +1,11 @@
+Index: b/src/OpenGL.xs
+===================================================================
--- a/src/OpenGL.xs
+++ b/src/OpenGL.xs
-@@ -67,6 +67,8 @@
- #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF
- #endif /* GL_ALL_CLIENT_BITS */
+@@ -69,6 +69,8 @@
+ #define GL_HAS_NURBS
+
+#define GL_HAS_NURBS
+
#include "../../src/defines.h"
Deleted: unstable/sdlperl/debian/patches/030_opengl_fixes.diff
===================================================================
--- unstable/sdlperl/debian/patches/030_opengl_fixes.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/030_opengl_fixes.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,62 +0,0 @@
---- a/src/OpenGL.xs
-+++ b/src/OpenGL.xs
-@@ -960,7 +960,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);
-
-@@ -970,7 +970,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);
-
-@@ -1054,7 +1054,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);
-
-@@ -1093,13 +1093,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 ) {
-@@ -1138,13 +1138,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 ) {
Deleted: unstable/sdlperl/debian/patches/040_sprintf.diff
===================================================================
--- unstable/sdlperl/debian/patches/040_sprintf.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/040_sprintf.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,11 +0,0 @@
---- a/src/SFont.xs
-+++ b/src/SFont.xs
-@@ -225,7 +225,7 @@
- if ((ch=='\b')&&(strlen(text)>0))
- text[strlen(text)-1]='\0';
- else if (ch!='\b')
-- sprintf(text,"%s%c",text,ch);
-+ sprintf(text+strlen(text),"%c",ch);
- if (SFont_TextWidth2(Font,text)>PixelWidth) text[strlen(text)-1]='\0';
- SDL_BlitSurface( Back, NULL, Dest, &rect);
- SFont_PutString2(Dest, Font, x, y, text);
Deleted: unstable/sdlperl/debian/patches/050_pod2man_fixes.diff
===================================================================
--- unstable/sdlperl/debian/patches/050_pod2man_fixes.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/050_pod2man_fixes.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,12 +0,0 @@
-Index: sdlperl/lib/SDL.pm
-===================================================================
---- sdlperl.orig/lib/SDL.pm 2009-09-02 00:16:26.000000000 -0700
-+++ sdlperl/lib/SDL.pm 2009-09-02 00:16:41.000000000 -0700
-@@ -108,6 +108,7 @@
- the bitwise OR product of the following functions:
-
- =over 4
-+
- =item *
- INIT_AUDIO()
-
Deleted: unstable/sdlperl/debian/patches/060_fix_example.diff
===================================================================
--- unstable/sdlperl/debian/patches/060_fix_example.diff 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/060_fix_example.diff 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,80 +0,0 @@
-Index: sdlperl/test/testjoystick.pl
-===================================================================
---- sdlperl.orig/test/testjoystick.pl 2009-09-02 00:21:02.000000000 -0700
-+++ sdlperl/test/testjoystick.pl 2009-09-02 00:26:37.000000000 -0700
-@@ -44,50 +44,50 @@
- {
- while($event->poll())
- {
-- if($event->type() eq SDL::JOYAXISMOTION())
-+ if($event->type() eq SDL_JOYAXISMOTION)
- {
- print "Joystick ".SDL::JoyAxisEventWhich($$event).
- " axis ".SDL::JoyAxisEventAxis($$event).
- " value: ".SDL::JoyAxisEventValue($$event)."\n";
- }
-- elsif($event->type() eq SDL::JOYHATMOTION())
-+ elsif($event->type() eq SDL_JOYHATMOTION)
- {
- print "Joystick ".SDL::JoyHatEventWhich($$event).
- " hat ".SDL::JoyHatEventHat($$event);
-- if(SDL::JoyHatEventValue($$event) == SDL::HAT_CENTERED() )
-+ if(SDL::JoyHatEventValue($$event) == SDL_HAT_CENTERED() )
- {
- print " centered";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_UP() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_UP() ) {
- print " up";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_RIGHT() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_RIGHT() ) {
- print " right";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_DOWN() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_DOWN() ) {
- print " down";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_LEFT()) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_LEFT()) {
- print " left";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_RIGHTUP() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_RIGHTUP() ) {
- print " right & up";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_RIGHTDOWN() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_RIGHTDOWN() ) {
- print " right & down";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_LEFTDOWN() ) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_LEFTDOWN() ) {
- print " left & down";
-- } elsif(SDL::JoyHatEventValue($$event) == SDL::HAT_LEFTUP()) {
-+ } elsif(SDL::JoyHatEventValue($$event) == SDL_HAT_LEFTUP()) {
- print " left & up";
- }
- print "\n";
-- } elsif($event->type() eq SDL::JOYBALLMOTION()){
-+ } elsif($event->type() eq SDL_JOYBALLMOTION){
- print "Joystick ".SDL::JoyBallEventWhich($$event).
- " ball ".SDL::JoyBallEventBall($$event).
- " delta: (".SDL::JoyBallEventXrel($$event).
- ",".SDL::JoyBallEventYrel($$event)."\n";
-- } elsif($event->type() eq SDL::JOYBUTTONDOWN()){
-+ } elsif($event->type() eq SDL_JOYBUTTONDOWN){
- print "Joystick ".SDL::JoyButtonEventWhich($$event).
- " button ".SDL::JoyButtonEventButton($$event)." down\n";
-- } elsif($event->type() eq SDL::JOYBUTTONUP()){
-+ } elsif($event->type() eq SDL_JOYBUTTONUP){
- print "Joystick ".SDL::JoyButtonEventWhich($$event).
- " button ".SDL::JoyButtonEventButton($$event)." up\n";
-- } elsif($event->type() eq SDL_QUIT() or
-- ($event->type() eq SDL_KEYDOWN() and
-+ } elsif($event->type() eq SDL_QUIT or
-+ ($event->type() eq SDL_KEYDOWN and
- $event->key_sym() == SDLK_ESCAPE)){
- $done = 1;
- }
-@@ -101,7 +101,7 @@
- -height => 32,
- -x => $i*34,
- -y => $screenHeight-34);
-- if(SDL::JoystickGetButton($joystick, $i) eq SDL::PRESSED())
-+ if(SDL::JoystickGetButton($joystick, $i) eq SDL_PRESSED)
- {
- $app->fill($rect, $colorWhite);
- } else {
Modified: unstable/sdlperl/debian/patches/series
===================================================================
--- unstable/sdlperl/debian/patches/series 2009-09-26 21:10:14 UTC (rev 233)
+++ unstable/sdlperl/debian/patches/series 2009-09-26 21:17:48 UTC (rev 234)
@@ -1,8 +1,2 @@
-001_kfreebsd.diff
010_fontpath.diff
-020_fixexamples.diff
030_glu_nurbs.diff
-030_opengl_fixes.diff
-040_sprintf.diff
-050_pod2man_fixes.diff
-060_fix_example.diff
More information about the pkg-sdl-commits
mailing list