diff options
author | he <he@pkgsrc.org> | 2008-11-17 19:54:26 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2008-11-17 19:54:26 +0000 |
commit | 6a75476664c283212a2a841499141e4c7c1b67be (patch) | |
tree | 2577cd0b8d39d2fbedbcc2350612c7f87c56c6d1 /devel | |
parent | 5dc38428dec2d4c64c5caca0a811eaf854a29e5e (diff) | |
download | pkgsrc-6a75476664c283212a2a841499141e4c7c1b67be.tar.gz |
Update from version 1.19.2nb18 to 2.1.2.
Pkgsrc changes:
o Change to Module::Build
o Change MASTER_SITES to use CPAN
o Change location of packlist
o Add a few local patches to deal with some issues in this version:
1) Use appropriate include paths for GL headers
2) Import fix from CPAN bug 19155: ensure modules are installed
in the correct directory
3) Add a missing type to the typemap
4) Import fix from CPAN bug 32744: ensure Module::Build leaves
a packlist behind (define module_name).
With these changes in place, the module at least passes its own selftests.
Upstream changes:
Revision history for Perl extension SDL_perl.
* Sep 23 2004 David J. Goehrig <dgoehrig@cpan.org>
- added SDL::Config tests for SDL_gfx support to test/testgfxroto.pl
test/testgfxprim.pl and SDL::Tool::Graphic.pm
- removed exists test form SDL::Config::has()
- added SDL::PushEvent
- added SDL::SetEventType
- renamed SDL::OpenGL::glReadPixel(s)
- added error message for SDL::OpenGL::glLightModel
- cleaned up some formatting issues in OpenGL.xs
- fixed bug in SDL::Cdrom (referencing a scalar as a hashref)
- added some more documentation to SDL::Color
- added SDL::Event::push (Andy Bakun)
- fixed documentation and usage of SDL::Event::set
- added SDL::Event::type([type]) setting parameter
- updated Pod::ToDemo recommends in Build.PL
- added chromatic's OpenGL version checks
- added GL_ALL_CLIENT_ATTRIB_BITS (in addition to GL_CLIENT_ATTRIB_BITS)
- added chromatic's SDL::Build::Cygwin.pm and SDL::Build::Win32.pm
- applied chromatic's patches to SDL::Tutorial, etc. for updated Pod::ToDemo
* Sep 21 2004 David J. Goehrig <dgoehrig@cpan.org>
- added thread check to SDL::Constants.pm (prevent unsafe SelfLoader)
- applied Andy Bakun <sdlperl@thwartedefforts.org>'s patches
to SDL::CreateRGBSurfaceFrom, SDL::SurfaceCopy, and
SDL::FreeSurface
- applied GLint* to typemap patch
- applied glRenderMode patch
- applied gluPickMatrix patch
- fixed SDL::Surface::blit typo bug
- applied glGet patch by Luke (enumerating them all!)
- fixed typo bug in make/lib/SDL/Build/Darwin.pm
* Feb 23 2004 David J. Goehrig <dgoehrig@cpan.org>
- fixed OpenGL exporting & bootstrapping
- added ifdefs in OpenGL for NURBS and GLUTesslator
- updated the test scripts to use SDL::Config
- added OpenGL test
- modified SDL::Config->has to use grep instead
- fixed SDL::Cdrom::status
- added tests for SDL::Video and SDL::MPEG
- fixed gluPerspective in test1.pl & test2.pl
- moved SDL::OpenGL::Cube code into test2.pl
- released SDL_Perl-2.1.0
* Feb 7 2004 David J. Goehrig <dgoehrig@cpan.org>
- added more SMPEG support
- added SDL::Video.pm and SDL::MPEG
* Feb 6 2004 David J. Goehrig <dgoehrig@cpan.org>
- removed old build stuff
- added SDL::GetAppState
- added SDL::GetMouseState and SDL::GetRelativeMouseState
- added SDL Perl logo files
- Finalized 2.0.5 release
* Feb 6 2004 chromatic
- added SDL::Tutorial
- added SDL::Tutorial::Animation
- added SDL::Tutorial::Drawing
- added SDL::Tutorial::Images
* Feb 5 2004 David J. Goehrig <dgoehrig@cpan.org>
- port chromatic's Module::Build changes to 2.0.4
- moved SDL_TEXTWIDTH to SDL.pm (where EXPORTS BELONG in SDL.pm)
- applied chromatic's test directory change to testfonttool.pl
- fixed near/far in OpenGL.xs
- fixed checkkeys.pl to work with new event structure
- fixed testjoystick.pl to use new constants
- fixed USE_THREADS issue in build system
- fixed typo-bugs in SDL::Tool::Graphic.pm
- Updated MANIFEST
- fixed SFont support added SDL::SFont.pm
- removed SDL::Mixer and SDL::Event constants checks, no export
* Dec 21 2003 chromatic
- added glDeleteLists
- added glReadPixels
- added glReadPixel
* Sept 2 2003 David J. Goehrig <dave@sdlperl.org>
- fixed SDL::Music and SDL::Sound usage in SDL::Mixer
* Aug 28 2003 Stephane Desneux <sdx@desneux.com>
- added SDL_VIDEOEXPOSE constant in SDL::Constants
* Aug 26 2003 Stephane Desneux <sdx@desneux.com>
- modified Makefile.linux to remove debug unless $ENV{DEBUG} is defined
- added scripts/GL/gl.h header (OpenGL 1.4 header from Linux NVidia driver)
- modified gl_const.pl to generate SDL::OpenGL::Constants.pm using scripts/GL/gl.h
OpenGL constants now uses Exporter and SelfLoader
- modified sdl_const.pl to generate SDL::Constants
SDL constants now uses Exporter and SelfLoader
- modified SDL.pm to export constants from SDL::Constants
- modified SDL/OpenGL.pm to export constants from SDL::OpenGL::Constants
- changed all function names in OpenGL.xs (xxx replaced by glxxx or gluxxx)
changed export in SDL/OpenGL.pm accordingly
- removed warning in SDL::Surface::new()
* Aug 21 2003 David J. Goehrig <dave@sdlperl.org>
- applied Thomas Tongue's MacOS X support patches
* Aug 20 2003 David J. Goehrig <dave@sdlperl.org>
- fixed SDL::Event bug
* Aug 17 2003 David J. Goehrig <dave@sdlperl.org>
- applied Tels' call list patches
- fixed some general boneheadedness with use strict
- got tests really working
- applied Russell's SDL::Tool::Graphic::grayScale patch
- added glLightModel
* Aug 16 2003 David J. Goehrig <dave@sdlperl.org>
- applied morgoth.666's patch for glGetdv & others
- released 2.0 last week :)
* May 23 2003 David J. Goehrig <dave@sdlperl.org>
- applied Ryan Hanlon's patch for SDL::TTFont::width
* May 22 2003 David J. Goehrig <dave@sdlperl.org>
- fixed typemap
- changed SDL::Cdrom to use scalar refs
- changed SDL::Console to use scalar refs
- changed SDL::Event to use scalar refs
- changed SDL::Cursor to use scalar refs
- changed SDL::Font to use scalar refs
- changed SDL::Music to use scalar refs
- changed SDL::Palette to use scalar refs
- changed SDL::Sound to use scalar refs
* May 20 2003 David J. Goehrig <dave@sdlperl.org>
- added more OpenGL constants
- added OpenGL name & Feedback functions
- ported documentation from the website to distro
* Mar 13 2003 David J. Goehrig <dave@sdlperl.org>
- cleaned up OpenGL constants exportation
- fixed glColor alpha
- fixed all tests & the causes of failure
- fixed TTFont.pm color bug
- fixed SDL::Tool::Graphic
* Mar 11 2003 David J. Goehrig <dave@sdlperl.org>
- changed USE_THREAD support because perl5.8 usually builds with it
- added SDL::Constants & SDL::OpenGL::Constants
- removed constant functions from XS code (going easier on the linker)
- changed version to SDL_perl-2.0-beta1 Way Too much is Broken release
- Moved Opt/* to regular & fixing as found broken
- 27% of tests now fail!
* Feb 25 2003 David J. Goehrig <dave@sdlperl.org>
- resized the testmenu.pl script
* Jan 6 2003 Wayne Keenan <tripixuk@yahoo.co.uk>
- fixed testjoystick.pl
* Jan 4 2003 David J. Goehrig <dave@sdlperl.org>
- Added test suite, Thanks Tels
- Added SDL::SurfaceCopy finally
- Added SDL::Surface::new -surface && -copy constructors
- Changed SDL::Tool::Graphic::* to return a new SDL::Surface object
- Added SDL::Event::resize_w && SDL::Event::resize_h
* Jan 3 2003 David J. Goehrig <dave@sdlperl.org>
- SDL_perl-1.20.0 release
- fixed default pitch value in SDL::Surface
- fixed test/OpenGL/tutorials/*, removed nasty -flags options
* Jan 2 2003 David J. Goehrig <dave@sdlperl.org>
- Changed SDL::SurfacePixel to work as documented returns SDL_Color*
- Changed SDL::Surface::pixel to return SDL::Color object
- Changed SDL::SetColorKey to take SDL_Color*
- Changed SDL::Surface::set_color_key to take SDL_Color*,SDL::Color, && (x,y)
- Added test/testcolor.pl
- Fixed SDL::Opt::Surface::pixel to return SDL::Opt::Color objects
- Fixed test/testsprite.pl (must call display_format before set_color_key)
- removed use strict from test/testmenu.pl
- Added SDL::INIT_TIMER
* Jan 1 2003 David J. Goehrig <dave@sdlperl.org>
- Added a lot of documentation stubs
- Added SDL_PREALLOC support
- Added SDL_VIDEORESIZE event type
- Moved SDL_* SDL_Surface flags EXPORT to SDL::Surface
- Added SDL::App::resize & -resizeable tag
- Updated README
- Added SDL::Opt::Surface, SDL::Opt::Rect, SDL::Opt::Color
Diffstat (limited to 'devel')
-rw-r--r-- | devel/p5-SDL/Makefile | 13 | ||||
-rw-r--r-- | devel/p5-SDL/distinfo | 14 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-aa | 12 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-ab | 27 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-ac | 14 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-ad | 42 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-ae | 16 | ||||
-rw-r--r-- | devel/p5-SDL/patches/patch-af | 18 |
8 files changed, 133 insertions, 23 deletions
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 4073300bc1f..9ddf8f9a67c 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.35 2008/10/19 19:17:59 he Exp $ +# $NetBSD: Makefile,v 1.36 2008/11/17 19:54:26 he Exp $ # -DISTNAME= SDL_perl-1.19.2 -PKGNAME= p5-SDL-1.19.2 -PKGREVISION= 18 +DISTNAME= SDL_Perl-2.1.2 +PKGNAME= p5-SDL-2.1.2 CATEGORIES= devel perl5 -MASTER_SITES= ftp://sdlperl.org/SDL_perl/ +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DG/DGOEHRIG/} PKG_DESTDIR_SUPPORT= user-destdir @@ -15,7 +14,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sdlperl.org/ COMMENT= Perl module for SDL -PERL5_PACKLIST= auto/SDL_perl/.packlist +PERL5_MODULE_TYPE= Module::Build + +PERL5_PACKLIST= auto/SDL/.packlist .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" diff --git a/devel/p5-SDL/distinfo b/devel/p5-SDL/distinfo index 6ceb3700d90..cc375c3323f 100644 --- a/devel/p5-SDL/distinfo +++ b/devel/p5-SDL/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.3 2006/06/21 21:53:30 joerg Exp $ +$NetBSD: distinfo,v 1.4 2008/11/17 19:54:26 he Exp $ -SHA1 (SDL_perl-1.19.2.tar.gz) = 3c36b46bc533f62052c045724e3b98511fd825e1 -RMD160 (SDL_perl-1.19.2.tar.gz) = 9a657ade1b298e06ea4fa63f9a6dfb761b204165 -Size (SDL_perl-1.19.2.tar.gz) = 680136 bytes -SHA1 (patch-aa) = ab13f9909865f3af41e54613839570525b908084 +SHA1 (SDL_Perl-2.1.2.tar.gz) = 1f2ad20ce3657073a902ddfacd1a388ff698d3db +RMD160 (SDL_Perl-2.1.2.tar.gz) = 02ae15981e90869eba60aea68e286ba49320af55 +Size (SDL_Perl-2.1.2.tar.gz) = 783084 bytes +SHA1 (patch-ab) = bc66b0b79ba24f681722a7833b10a88a53b8cfc3 +SHA1 (patch-ac) = d1a20f4bcb6f03d524ad4f7887cfc1edf4046635 +SHA1 (patch-ad) = a2122180e1da72c755466aa51f75bbba8607fa9e +SHA1 (patch-ae) = 4b8c70e7ac886a7b6e6dac2bb4a1b3580d0749e3 +SHA1 (patch-af) = 755e7d4954b6ad4ace6b63c44bb3764ce116a4b6 diff --git a/devel/p5-SDL/patches/patch-aa b/devel/p5-SDL/patches/patch-aa deleted file mode 100644 index df695fd40f3..00000000000 --- a/devel/p5-SDL/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2006/06/21 21:53:31 joerg Exp $ ---- Makefile.PL.old Wed Jan 1 15:54:59 2003 -+++ Makefile.PL Wed Jan 1 15:55:16 2003 -@@ -5,6 +5,8 @@ - # - - %OS = ( -+ netbsd => "Makefile.netbsd", -+ dragonfly => "Makefile.netbsd", - linux => "Makefile.linux", - win => "Makefile.win32", - freebsd => "Makefile.freebsd", diff --git a/devel/p5-SDL/patches/patch-ab b/devel/p5-SDL/patches/patch-ab new file mode 100644 index 00000000000..d9e4ceba9c4 --- /dev/null +++ b/devel/p5-SDL/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.1 2008/11/17 19:54:26 he Exp $ + +Tweak includes so that they can be found. +Latter include is due to CPAN bug 19155. + +--- src/OpenGL.xs.orig 2004-09-24 00:36:56.000000000 +0000 ++++ src/OpenGL.xs +@@ -12,8 +12,8 @@ + + #include <SDL.h> + +-#include <gl.h> +-#include <glu.h> ++#include <GL/gl.h> ++#include <GL/glu.h> + + #ifdef USE_THREADS + #define HAVE_TLS_CONTEXT +@@ -23,7 +23,7 @@ + #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF + #endif /* GL_ALL_CLIENT_BITS */ + +-#include "../defines.h" ++#include "../src/defines.h" + + SV* sdl_perl_nurbs_error_hook; + void diff --git a/devel/p5-SDL/patches/patch-ac b/devel/p5-SDL/patches/patch-ac new file mode 100644 index 00000000000..02f8fcdf942 --- /dev/null +++ b/devel/p5-SDL/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2008/11/17 19:54:26 he Exp $ + +Define a missing type used in OpenGL.xs. + +--- typemap.orig 2004-09-24 00:36:56.000000000 +0000 ++++ typemap +@@ -54,6 +54,7 @@ GLboolean T_U_CHAR + GLUnurbsObj * T_PTR + GLUtesselator * T_PTR + GLuint T_UV ++GLint T_IV + GLint* T_PTR + float * T_PTR + float T_NV diff --git a/devel/p5-SDL/patches/patch-ad b/devel/p5-SDL/patches/patch-ad new file mode 100644 index 00000000000..931f4867169 --- /dev/null +++ b/devel/p5-SDL/patches/patch-ad @@ -0,0 +1,42 @@ +$NetBSD: patch-ad,v 1.1 2008/11/17 19:54:26 he Exp $ + +Ensure that the xs modules are installed in the right path. +This fix is from CPAN bug #19155. +The tweak to the module_name is from the diff in CPAN bug #32744. + +--- Build.PL.orig 2004-09-24 00:36:56.000000000 +0000 ++++ Build.PL +@@ -34,7 +34,7 @@ my %subsystems = + SDL => { + file => { + from => 'src/SDL.xs', +- to => 'src/SDL_perl.xs', ++ to => './SDL_perl.xs', + }, + libraries => [qw( SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx + png jpeg smpeg )], +@@ -42,14 +42,14 @@ my %subsystems = + OpenGL => { + file => { + from => 'src/OpenGL.xs', +- to => 'src/SDL/OpenGL.xs', ++ to => 'SDL/OpenGL.xs', + }, + libraries => [qw( SDL GL GLU )], + }, + SFont => { + file => { + from => 'src/SFont.xs', +- to => 'src/SDL/SFont.xs', ++ to => 'SDL/SFont.xs', + }, + libraries => [qw( SDL SDL_image )], + }, +@@ -122,6 +122,7 @@ my %xs = map { $subsystems{$_}{file}{fro + keys %subsystems; + + my $build = SDL::Build->new( ++ module_name => 'SDL', + dist_name => 'SDL_Perl', + license => 'lgpl', + dist_version_from => 'lib/SDL.pm', diff --git a/devel/p5-SDL/patches/patch-ae b/devel/p5-SDL/patches/patch-ae new file mode 100644 index 00000000000..a212b91a0aa --- /dev/null +++ b/devel/p5-SDL/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2008/11/17 19:54:26 he Exp $ + +This is from CPAN bug #19155, adapting to the new location +of the C source file. + +--- src/SDL.xs.orig 2004-09-24 00:36:56.000000000 +0000 ++++ src/SDL.xs +@@ -69,7 +69,7 @@ static int sdl_perl_use_smpeg_audio = 0; + #define HAVE_TLS_CONTEXT + #endif + +-#include "defines.h" ++#include "src/defines.h" + + Uint32 + sdl_perl_timer_callback ( Uint32 interval, void* param ) diff --git a/devel/p5-SDL/patches/patch-af b/devel/p5-SDL/patches/patch-af new file mode 100644 index 00000000000..c2e3e30ae3b --- /dev/null +++ b/devel/p5-SDL/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2008/11/17 19:54:26 he Exp $ + +This is from CPAN bug #19155, adapting to the new placement +of the C source files. + +--- src/SFont.xs.orig 2004-09-24 00:36:56.000000000 +0000 ++++ src/SFont.xs +@@ -23,8 +23,8 @@ + #define HAVE_TLS_CONTEXT + #endif + +-#include "../defines.h" +-#include "../SFont.h" ++#include "../src/defines.h" ++#include "../src/SFont.h" + + #ifdef HAVE_SDL_IMAGE + #include <SDL_image.h> |