Skip to content
Browse files

merged Changelog

  • Loading branch information...
2 parents d0e9d87 + 4694086 commit c71dceec74956c70affbb4daa1d4f0035f3dd864 @FROGGS FROGGS committed Jul 15, 2012
Showing with 57 additions and 27 deletions.
  1. +5 −0 Changes
  2. +30 −23 README
  3. +18 −0 bin/sdl-config.pl
  4. +1 −1 inc/My/Builder.pm
  5. +1 −1 inc/My/Builder/Unix.pm
  6. +2 −2 lib/Alien/SDL.pm
View
5 Changes
@@ -5,6 +5,11 @@ Versioning rule: public releases are even numbers, dev releases are odd. (same l
TODO
- check for available libs when using --with-sdl-config option
+1.437_2
+ - changed shlib regex to match libz and libfreetype [jtpalmer]
+ - disabling mmx for SDL_gfx for armv6-unix [jtpalmer]
+ - added bin script to make configuring easier [kthakore]
+
1.437_1 Mon Jun 25 2012
- CFLAGS: added several circumstances where we need /usr/X11R7/... [FROGGS]
- CFLAGS: removed /usr/pkg/..., that clashed on my netbsd [FROGGS]
View
53 README
@@ -2,13 +2,14 @@ NAME
Alien::SDL - building, finding and using SDL binaries
VERSION
- Version 1.436
+ Version 1.437_1
SYNOPSIS
Alien::SDL tries (in given order) during its installation:
- * When given `--with-sdl-config' option use specified sdl-config script
- to locate SDL libs.
+ * When given "--with-sdl-config" option use specified sdl-config
+ script to locate SDL libs.
+
perl Build.PL --with-sdl-config=/opt/sdl/bin/sdl-config
or using default script name 'sdl-config' by running:
@@ -18,14 +19,17 @@ SYNOPSIS
IMPORTANT NOTE: Using --with-sdl-config avoids considering any other
build methods; no prompt with other available build options.
- * Locate an already installed SDL via 'sdl-config' script.
- * Check for SDL libs in directory specified by SDL_INST_DIR variable. In
- this case the module performs SDL library detection via
- '$SDL_INST_DIR/bin/sdl-config' script.
+ * Locate an already installed SDL via 'sdl-config' script.
+
+ * Check for SDL libs in directory specified by SDL_INST_DIR variable.
+ In this case the module performs SDL library detection via
+ '$SDL_INST_DIR/bin/sdl-config' script.
+
SDL_INST_DIR=/opt/sdl perl ./Build.PL
- * Download prebuilt SDL binaries (if available for your platform).
- * Build SDL binaries from source codes (if possible on your system).
+ * Download prebuilt SDL binaries (if available for your platform).
+
+ * Build SDL binaries from source codes (if possible on your system).
Later you can use Alien::SDL in your module that needs to link agains
SDL and/or related libraries like this:
@@ -45,25 +49,28 @@ SYNOPSIS
DESCRIPTION
Please see Alien for the manifesto of the Alien namespace.
- In short `Alien::SDL' can be used to detect and get configuration
+ In short "Alien::SDL" can be used to detect and get configuration
settings from an installed SDL and related libraries. Based on your
platform it offers the possibility to download and install prebuilt
binaries or to build SDL & co. from source codes.
The important facts:
- * The module does not modify in any way the already existing SDL
- installation on your system.
- * If you reinstall SDL libs on your system you do not need to reinstall
- Alien::SDL (providing that you use the same directory for the new
- installation).
- * The prebuild binaries and/or binaries built from sources are always
- installed into perl module's 'share' directory.
- * If you use prebuild binaries and/or binaries built from sources it
- happens that some of the dynamic libraries (*.so, *.dll) will not
- automaticly loadable as they will be stored somewhere under perl
- module's 'share' directory. To handle this scenario Alien::SDL offers
- some special functionality (see below).
+ * The module does not modify in any way the already existing SDL
+ installation on your system.
+
+ * If you reinstall SDL libs on your system you do not need to
+ reinstall Alien::SDL (providing that you use the same directory for
+ the new installation).
+
+ * The prebuild binaries and/or binaries built from sources are always
+ installed into perl module's 'share' directory.
+
+ * If you use prebuild binaries and/or binaries built from sources it
+ happens that some of the dynamic libraries (*.so, *.dll) will not
+ automaticly loadable as they will be stored somewhere under perl
+ module's 'share' directory. To handle this scenario Alien::SDL
+ offers some special functionality (see below).
METHODS
config()
@@ -129,7 +136,7 @@ METHODS
BUGS
Please post issues and bugs at
- http://rt.cpan.org/NoAuth/Bugs.html?Dist=Alien-SDL
+ <http://rt.cpan.org/NoAuth/Bugs.html?Dist=Alien-SDL>
AUTHOR
Kartik Thakore
View
18 bin/sdl-config.pl
@@ -0,0 +1,18 @@
+#! perl
+use strict;
+use warnings;
+use Alien::SDL;
+use Getopt::Long;
+
+my $libs; my $cflags; my $prefix;
+
+my $result = GetOptions ( "libs" => \$libs,
+ "cflags" => \$cflags,
+ "prefix" => \$prefix );
+
+
+print Alien::SDL->config('libs') if $libs;
+print Alien::SDL->config('cflags') if $cflags;
+print Alien::SDL->config('prefix') if $prefix;
+
+
View
2 inc/My/Builder.pm
@@ -308,7 +308,7 @@ sub set_ld_config {
elsif ($f =~ /^(lib)?(png12)/) {
$shlib_map{png12} = $full unless $shlib_map{png12}; # what if it isnt png12?
}
- elsif ($f =~ /^(lib)?(intl|tiff|jpeg|png|ogg|vorbis|vorbisfile|FLAC|mikmod)[^a-zA-Z]/) {
+ elsif ($f =~ /^(lib)?(intl|z|tiff|jpeg|png|ogg|vorbis|vorbisfile|freetype|FLAC|mikmod)[^a-zA-Z]/) {
$shlib_map{$2} = $full unless $shlib_map{$2};
}
elsif ($f =~ /^(lib)?(SDL_[a-zA-Z]{2,8})[^a-zA-Z0-9]/) {
View
2 inc/My/Builder/Unix.pm
@@ -136,7 +136,7 @@ sub _get_configure_cmd {
# NOTE: all ugly IFs concerning ./configure params have to go here
- if($pack eq 'SDL_gfx' && $uname =~ /(powerpc|ppc|64|2level|alpha|armv5|sparc)/i) {
+ if($pack eq 'SDL_gfx' && $uname =~ /(powerpc|ppc|64|2level|alpha|armv[56]|sparc)/i) {
$extra .= ' --disable-mmx';
}
View
4 lib/Alien/SDL.pm
@@ -16,11 +16,11 @@ Alien::SDL - building, finding and using SDL binaries
=head1 VERSION
-Version 1.436
+Version 1.437_1
=cut
-our $VERSION = '1.436';
+our $VERSION = '1.437_1';
$VERSION = eval $VERSION;
=head1 SYNOPSIS

0 comments on commit c71dcee

Please sign in to comment.
Something went wrong with that request. Please try again.