commit perl-Alien-SDL for openSUSE:Factory

Hello community, here is the log from the commit of package perl-Alien-SDL for openSUSE:Factory checked in at 2014-06-23 10:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Alien-SDL (Old) and /work/SRC/openSUSE:Factory/.perl-Alien-SDL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Alien-SDL" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Alien-SDL/perl-Alien-SDL.changes 2013-06-06 13:06:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Alien-SDL.new/perl-Alien-SDL.changes 2014-06-23 10:44:58.000000000 +0200 @@ -1,0 +2,19 @@ +Sun Jun 8 08:30:30 UTC 2014 - stephan.barth@suse.com + +- replaced --with-sdl-config with --travis, because otherwise it won't build + properly. Issue is reported upstream + https://github.com/PerlGameDev/SDL/issues/265 +- Update to version 1.444 from 1.440 + Important changes from upstream: + 1.444 Wed May 14 2014 + - let SDL_Pango.h include ft2build.h, because even when the header file + ifdef's out some code that needs it, the source file does not and thus + explodes happily. [FROGGS] + - add PIC flags to CFLAGS when the compiler can handle it, this is meant + to fix an issue on freebsd [FROGGS] + + 1.442 Tue Apr 22 2014 + - bump SDL_gfx to 2.0.25 [FROGGS] + - fix for building on >=libX11-1.5.99.901 [FROGGS] + +------------------------------------------------------------------- Old: ---- Alien-SDL-1.440.tar.gz New: ---- Alien-SDL-1.444.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Alien-SDL.spec ++++++ --- /var/tmp/diff_new_pack.WNhJi9/_old 2014-06-23 10:44:59.000000000 +0200 +++ /var/tmp/diff_new_pack.WNhJi9/_new 2014-06-23 10:44:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Alien-SDL # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Alien-SDL -Version: 1.440 +Version: 1.444 Release: 0 %define cpan_name Alien-SDL Summary: Building, finding and using SDL binaries @@ -37,6 +37,7 @@ BuildRequires: perl-macros BuildRequires: perl(Module::Build) # +BuildRequires: perl(Archive::Extract) BuildRequires: perl(Archive::Zip) BuildRequires: perl(Capture::Tiny) BuildRequires: perl(Digest::SHA) @@ -85,7 +86,7 @@ %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Build.PL installdirs=vendor --with-sdl-config +%{__perl} Build.PL installdirs=vendor --travis ./Build build flags=%{?_smp_mflags} %check ++++++ Alien-SDL-1.440.tar.gz -> Alien-SDL-1.444.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/Build.PL new/Alien-SDL-1.444/Build.PL --- old/Alien-SDL-1.440/Build.PL 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/Build.PL 2014-05-14 08:48:03.000000000 +0200 @@ -4,7 +4,12 @@ use lib "inc"; use File::Spec::Functions qw(catdir catfile); use Config; -use My::Utility qw(check_config_script check_prebuilt_binaries check_prereqs_libs check_prereqs_tools $source_packs); +use My::Utility qw(check_config_script check_prebuilt_binaries check_prereqs_libs check_prereqs_tools $source_packs + check_perl_buildlibs); + +use Getopt::Long; +my ( $ans, $travis ) = 0; +GetOptions( "travis" => \$travis ); print "Welcome to Alien::SDL module installation\n"; print "-----------------------------------------\n"; @@ -103,6 +108,7 @@ my $choice; my %have_libs = (); +my %perl_libs = (); if (defined $sdl_config) { # handle --with-sdl-config (without params) @@ -169,6 +175,8 @@ } } + $perl_libs{pthread} = check_perl_buildlibs('pthread') if $have_libs{pthread} && $^O eq 'openbsd'; + # prebuilt binaries (windows only) push @candidates, @{$rv} if $rv = check_prebuilt_binaries($build->os_type); @@ -207,8 +215,17 @@ $prompt_string .= "[" . $i++ . "] " . $c->{title} . "\n"; } - $prompt_string .= "\nWhat way do you wanna go?"; - my $ans = $build->prompt($prompt_string, $recommended_candidate); + + # select option '1' for travis + if ( defined $travis and $travis == 1 ) { + $ans = 1; + } + +# or prompt user for build option + else { + $prompt_string .= "\nWhat way do you wanna go?"; + $ans = $build->prompt( $prompt_string, $recommended_candidate ); + } if($ans > 0 && $ans < scalar(@candidates)) { $choice = $candidates[$ans - 1]; @@ -224,6 +241,7 @@ $build->notes('env_include', $ENV{INCLUDE}) if $ENV{INCLUDE}; $build->notes('env_lib', $ENV{LIB}) if $ENV{LIB}; $build->notes('have_libs', \%have_libs); + $build->notes('perl_libs', \%perl_libs); $build->create_build_script(); #### clean build_done stamp; force rebuild when running 'Build' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/Changes new/Alien-SDL-1.444/Changes --- old/Alien-SDL-1.440/Changes 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/Changes 2014-05-14 08:48:03.000000000 +0200 @@ -5,6 +5,18 @@ TODO - check for available libs when using --with-sdl-config option +1.444 Wed May 14 2014 + - check that perl was linked against pthread and do a pthread-less build if not (OpenBSD) [FROGGS] + - add patch that replaces $^ in Makefile.in, which can be a problem for BSD's make [FROGGS] + - let SDL_Pango.h include ft2build.h, because even when the header file ifdef's out some + code that needs it, the source file does not and thus explodes happily. [FROGGS] + - add PIC flags to CFLAGS when the compiler can handle it, this is meant to fix + an issue on freebsd [FROGGS] + +1.442 Tue Apr 22 2014 + - bump SDL_gfx to 2.0.25 [FROGGS] + - fix for building on >=libX11-1.5.99.901 [FROGGS] + 1.440 Sun Aug 12 2012 - patch for File::Temp->tempfile -> File::Temp::tempfile (#244) [FROGGS] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/MANIFEST new/Alien-SDL-1.444/MANIFEST --- old/Alien-SDL-1.440/MANIFEST 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/MANIFEST 2014-05-14 08:48:03.000000000 +0200 @@ -12,6 +12,10 @@ META.yml patches/jpeg-8a_cygwin.patch patches/libsdl-1.2.13-sdl-config.patch +patches/libsdl-1.2.15-const-xdata32.1.patch +patches/libsdl-1.2.15-const-xdata32.2.patch +patches/libsdl-1.2.15-const-xdata32.3.patch +patches/libsdl-1.2.15-const-xdata32.4.patch patches/libvorbis-1.3.3-configure.patch patches/SDL-1.2-openbsd-rldflags.patch patches/SDL-1.2.14-configure @@ -20,7 +24,9 @@ patches/SDL-1.2.14-SDL_platform_h.patch patches/SDL-1.2.14-SDL_x11gl_c.patch patches/SDL-1.2.14-video_mmx.patch +patches/SDL-1.2.15-Makefile.in-OBJECTS.patch patches/SDL-1.2.15-openbsd-rldflags.patch +patches/SDL-1.2.15-PIC-in-CFLAGS.patch patches/SDL_config_win32.h patches/SDL_gfx-2.0.20-configure.patch patches/SDL_image-1.2.10-libpng-flags.patch @@ -36,6 +42,7 @@ patches/SDL_Pango-0.1.2-config-tools.1.patch patches/SDL_Pango-0.1.2-config-tools.2.patch patches/SDL_Pango-0.1.2-config-tools.3.patch +patches/SDL_Pango-0.1.2-include-ft2build.h.patch patches/test1.patch patches/zlib-1.2.5-bsd-ldconfig.patch README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/META.json new/Alien-SDL-1.444/META.json --- old/Alien-SDL-1.440/META.json 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/META.json 2014-05-14 08:48:03.000000000 +0200 @@ -62,7 +62,7 @@ "provides" : { "Alien::SDL" : { "file" : "lib/Alien/SDL.pm", - "version" : "1.440" + "version" : "1.444" } }, "release_status" : "stable", @@ -77,5 +77,5 @@ "url" : "http://github.com/PerlGameDev/Alien-SDL" } }, - "version" : "1.440" + "version" : "1.444" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/META.yml new/Alien-SDL-1.444/META.yml --- old/Alien-SDL-1.440/META.yml 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/META.yml 2014-05-14 08:48:03.000000000 +0200 @@ -39,7 +39,7 @@ provides: Alien::SDL: file: lib/Alien/SDL.pm - version: 1.440 + version: 1.444 requires: Capture::Tiny: 0 ExtUtils::CBuilder: 0 @@ -52,4 +52,4 @@ bugtracker: http://github.com/PerlGameDev/SDL/issues?labels=Alien-SDL license: http://dev.perl.org/licenses/ repository: http://github.com/PerlGameDev/Alien-SDL -version: 1.440 +version: 1.444 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/README new/Alien-SDL-1.444/README --- old/Alien-SDL-1.440/README 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/README 2014-05-14 08:48:03.000000000 +0200 @@ -2,7 +2,7 @@ Alien::SDL - building, finding and using SDL binaries VERSION - Version 1.440 + Version 1.444 SYNOPSIS Alien::SDL tries (in given order) during its installation: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/inc/My/Builder/Unix.pm new/Alien-SDL-1.444/inc/My/Builder/Unix.pm --- old/Alien-SDL-1.440/inc/My/Builder/Unix.pm 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/inc/My/Builder/Unix.pm 2014-05-14 08:48:03.000000000 +0200 @@ -37,7 +37,12 @@ } } push @list, (keys %rv); - push @list, '-lpthread' if ($^O eq 'openbsd'); + if ($^O eq 'openbsd') { + my $osver = `uname -r 2>/dev/null`; + if ($self->notes('perl_libs')->{pthread} || ($osver && $osver < 5.0)) { + push @list, '-lpthread' + } + } return join(' ', @list); } @@ -161,8 +166,11 @@ $extra .= ' --disable-audio'; } - if($pack eq 'SDL' && $^O eq 'openbsd') { - $extra_ldflags .= ' -lpthread'; + if ($pack eq 'SDL' && $^O eq 'openbsd') { + my $osver = `uname -r 2>/dev/null`; + if (!$self->notes('perl_libs')->{pthread} || !$osver || $osver >= 5.0) { + $extra .= ' --disable-pthreads'; + } } if($pack =~ /^SDL_/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/inc/My/Builder.pm new/Alien-SDL-1.444/inc/My/Builder.pm --- old/Alien-SDL-1.440/inc/My/Builder.pm 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/inc/My/Builder.pm 2014-05-14 08:48:03.000000000 +0200 @@ -266,6 +266,13 @@ } } + if ($^O eq 'openbsd') { + my $osver = `uname -r 2>/dev/null`; + if (!$self->notes('perl_libs')->{pthread} || !$osver || $osver >= 5.0) { + $cfg->{libs} =~ s/\s*-l?pthread//g; + } + } + # write config $self->config_data('additional_cflags', '-I' . $self->get_path('@PrEfIx@/include') . ' ' . '-I' . $self->get_path('@PrEfIx@/include/smpeg') . ' ' . @@ -330,8 +337,17 @@ pangoft2 pango gobject gmodule glib fontconfig expat )) { if( !$shlib_map{$_} && $have_libs->{$_}->[0] ) { next unless defined $have_libs->{$_}->[1]; - push @{ $cfg->{ld_shared_libs} }, $have_libs->{$_}->[1]; - $shlib_map{$_} = $have_libs->{$_}->[1]; + if ($_ eq 'pthread' && $^O eq 'openbsd') { + my $osver = `uname -r 2>/dev/null`; + if ($self->notes('perl_libs')->{pthread} || ($osver && $osver < 5.0)) { + push @{ $cfg->{ld_shared_libs} }, $have_libs->{$_}->[1]; + $shlib_map{$_} = $have_libs->{$_}->[1]; + } + } + else { + push @{ $cfg->{ld_shared_libs} }, $have_libs->{$_}->[1]; + $shlib_map{$_} = $have_libs->{$_}->[1]; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/inc/My/Utility.pm new/Alien-SDL-1.444/inc/My/Utility.pm --- old/Alien-SDL-1.440/inc/My/Utility.pm 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/inc/My/Utility.pm 2014-05-14 08:48:03.000000000 +0200 @@ -4,7 +4,7 @@ use base qw(Exporter); our @EXPORT_OK = qw(check_config_script check_prebuilt_binaries check_prereqs_libs check_prereqs_tools find_SDL_dir find_file check_header - sed_inplace get_dlext $inc_lib_candidates $source_packs); + sed_inplace get_dlext $inc_lib_candidates $source_packs check_perl_buildlibs); use Config; use ExtUtils::CBuilder; use File::Spec::Functions qw(splitdir catdir splitpath catpath rel2abs); @@ -43,7 +43,7 @@ 'http://froggs.de/libsdl/Win32_SDL-1.2.14-extended-bin_20100704.zip', ], sha1sum => '98409ddeb649024a9cc1ab8ccb2ca7e8fe804fd8', - arch_re => qr/^MSWin32-x86-multi-thread$/, + arch_re => qr/^MSWin32-x86-multi-thread(-64int)?$/, os_re => qr/^MSWin32$/, cc_re => qr/gcc/, }, @@ -55,7 +55,7 @@ 'http://froggs.de/libsdl/Win32_SDL-1.2.14-extended-bin_20111205.zip', ], sha1sum => '553b7e21bb650d047ec9f2a5f650c67d76430e61', - arch_re => qr/^MSWin32-x86-multi-thread$/, + arch_re => qr/^MSWin32-x86-multi-thread(-64int)?$/, os_re => qr/^MSWin32$/, cc_re => qr/gcc/, }, @@ -188,6 +188,12 @@ patches => [ 'test1.patch', 'SDL-1.2-openbsd-rldflags.patch', + 'libsdl-1.2.15-const-xdata32.1.patch', + 'libsdl-1.2.15-const-xdata32.2.patch', + 'libsdl-1.2.15-const-xdata32.3.patch', + 'libsdl-1.2.15-const-xdata32.4.patch', + 'SDL-1.2.15-PIC-in-CFLAGS.patch', + 'SDL-1.2.15-Makefile.in-OBJECTS.patch', ], prereqs => { libs => [ @@ -277,13 +283,13 @@ }, { pack => 'SDL_gfx', - version => '2.0.23', - dirname => 'SDL_gfx-2.0.23', + version => '2.0.25', + dirname => 'SDL_gfx-2.0.25', url => [ - 'http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.23.tar.gz', - 'http://froggs.de/libsdl/SDL_gfx-2.0.23.tar.gz', + 'http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.25.tar.gz', + 'http://froggs.de/libsdl/SDL_gfx-2.0.25.tar.gz', ], - sha1sum => 'aae60e7fed539f3f8a0a0bd6da3bbcf625642596', + sha1sum => '20a89d0b71b7b790b830c70f17ed2c44100bc0f4', patches => [ ], prereqs => { libs => [ ] @@ -304,6 +310,7 @@ 'SDL_Pango-0.1.2-config-tools.1.patch', 'SDL_Pango-0.1.2-config-tools.2.patch', 'SDL_Pango-0.1.2-config-tools.3.patch', + 'SDL_Pango-0.1.2-include-ft2build.h.patch', ], prereqs => { libs => [ @@ -411,6 +418,27 @@ return $ret; } +sub check_perl_buildlibs { + my @libs = @_; + my $ret = 1; + my $dlext = get_dlext(); + my $devnull = File::Spec->devnull(); + for my $lib (@libs) { + print "checking if perl is linked against $lib... "; + if($Config{libs} =~ /\Q-l$lib\E\b/ + || $Config{perllibs} =~ /\Q-l$lib\E\b/ + || `ldd $^X 2>$devnull` =~ /[\/\\]lib\Q$lib\E[\-\d\.]*\.($dlext[\d\.]*|so|dll)$/) { + print "yes\n"; + $ret &= 1; + } + else { + print "no\n"; + $ret = 0; + } + } + return $ret; +} + sub check_prereqs { my $bp = shift; my $ret = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/lib/Alien/SDL.pm new/Alien-SDL-1.444/lib/Alien/SDL.pm --- old/Alien-SDL-1.440/lib/Alien/SDL.pm 2013-04-17 08:33:29.000000000 +0200 +++ new/Alien-SDL-1.444/lib/Alien/SDL.pm 2014-05-14 08:48:03.000000000 +0200 @@ -16,11 +16,11 @@ =head1 VERSION -Version 1.440 +Version 1.444 =cut -our $VERSION = '1.440'; +our $VERSION = '1.444'; $VERSION = eval $VERSION; =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch new/Alien-SDL-1.444/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch --- old/Alien-SDL-1.440/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/SDL-1.2.15-Makefile.in-OBJECTS.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,15 @@ +--- SDL-1.2/Makefile.in 2012-05-28 13:21:48.000000000 +0200 ++++ SDL-1.2/Makefile.in.new 2014-05-04 20:07:10.000000000 +0200 +@@ -72,10 +72,10 @@ + include $(depend) + + $(objects)/$(TARGET): $(OBJECTS) +- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) +- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS) + + + install: all install-bin install-hdrs install-lib install-data install-man diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/SDL-1.2.15-PIC-in-CFLAGS.patch new/Alien-SDL-1.444/patches/SDL-1.2.15-PIC-in-CFLAGS.patch --- old/Alien-SDL-1.440/patches/SDL-1.2.15-PIC-in-CFLAGS.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/SDL-1.2.15-PIC-in-CFLAGS.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,13 @@ +--- SDL-1.2/configure 2014-04-23 12:59:05.000000000 +0200 ++++ SDL-1.2/configure 2014-04-23 12:59:14.000000000 +0200 +@@ -7538,7 +7538,9 @@ + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; +- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ++ CFLAGS="$CFLAGS$lt_prog_compiler_pic" ++ ;; + esac + else + lt_prog_compiler_pic= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/SDL_Pango-0.1.2-include-ft2build.h.patch new/Alien-SDL-1.444/patches/SDL_Pango-0.1.2-include-ft2build.h.patch --- old/Alien-SDL-1.440/patches/SDL_Pango-0.1.2-include-ft2build.h.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/SDL_Pango-0.1.2-include-ft2build.h.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,10 @@ +--- SDL_Pango-0.1.2/src/SDL_Pango.h 2014-04-23 13:10:40.000000000 +0200 ++++ SDL_Pango-0.1.2/src/SDL_Pango.h 2014-04-24 10:22:58.000000000 +0200 +@@ -34,6 +34,7 @@ + #include "SDL.h" + + #include "begin_code.h" ++#include + + #ifdef __cplusplus + extern "C" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.1.patch new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.1.patch --- old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.1.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.1.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,20 @@ +--- SDL-1.2/configure.in 2012-05-28 13:21:49.000000000 +0200 ++++ SDL-1.2/configure.in 2014-04-22 20:22:46.000000000 +0200 +@@ -1127,6 +1127,17 @@ + if test x$definitely_enable_video_x11_xrandr = xyes; then + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) + fi ++ AC_MSG_CHECKING(for const parameter to _XData32) ++ have_const_param_xdata32=no ++ AC_TRY_COMPILE([ ++ #include ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ ],[ ++ ],[ ++ have_const_param_xdata32=yes ++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) ++ ]) ++ AC_MSG_RESULT($have_const_param_xdata32) + fi + fi + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.2.patch new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.2.patch --- old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.2.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,10 @@ +--- SDL-1.2/include/SDL_config.h.in 2012-05-28 13:21:49.000000000 +0200 ++++ SDL-1.2/include/SDL_config.h.in 2014-04-22 20:24:02.000000000 +0200 +@@ -282,6 +282,7 @@ + #undef SDL_VIDEO_DRIVER_WINDIB + #undef SDL_VIDEO_DRIVER_WSCONS + #undef SDL_VIDEO_DRIVER_X11 ++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 + #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC + #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.3.patch new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.3.patch --- old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.3.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.3.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,14 @@ +--- SDL-1.2/src/video/x11/SDL_x11sym.h 2012-05-28 13:21:49.000000000 +0200 ++++ SDL-1.2/src/video/x11/SDL_x11sym.h 2014-04-22 20:18:37.000000000 +0200 +@@ -165,7 +165,11 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) ++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) ++#else + SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++#endif + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.4.patch new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.4.patch --- old/Alien-SDL-1.440/patches/libsdl-1.2.15-const-xdata32.4.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/Alien-SDL-1.444/patches/libsdl-1.2.15-const-xdata32.4.patch 2014-05-14 08:48:03.000000000 +0200 @@ -0,0 +1,62 @@ +--- SDL-1.2/configure 2014-04-22 20:52:13.000000000 +0200 ++++ SDL-1.2/configure 2014-04-22 20:52:27.000000000 +0200 +@@ -24440,6 +24440,59 @@ + _ACEOF + + fi ++ { echo "$as_me:$LINENO: checking for const parameter to _XData32" >&5 ++ echo $ECHO_N "checking for const parameter to _XData32... $ECHO_C" >&6; } ++ have_const_param_xdata32=no ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++ cat confdefs.h >>conftest.$ac_ext ++ cat >>conftest.$ac_ext <<_ACEOF ++#include ++extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ ++int ++main () ++{ ++ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ have_const_param_xdata32=yes ++ cat >>confdefs.h <<\_ACEOF ++#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1 ++_ACEOF ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ have_const_param_xdata32=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: $have_const_param_xdata32" >&5 ++ echo "${ECHO_T}$have_const_param_xdata32" >&6; } + fi + fi + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org