Switched from SDL_mixer to SDL2_mixer
authorSam Lantinga <slouken@libsdl.org>
Sat, 28 Jan 2012 10:55:23 -0500
changeset 5783b2c95ee3398
parent 577 6bf901218e81
child 579 2b0af956825c
Switched from SDL_mixer to SDL2_mixer
.hgignore
Makefile.in
SDL2_mixer.pc.in
SDL2_mixer.spec.in
SDL_mixer.pc.in
SDL_mixer.qpg.in
SDL_mixer.spec.in
acinclude/sdl.m4
acinclude/sdl2.m4
aclocal.m4
configure
configure.in
     1.1 --- a/.hgignore	Sat Jan 28 10:44:44 2012 -0500
     1.2 +++ b/.hgignore	Sat Jan 28 10:55:23 2012 -0500
     1.3 @@ -4,7 +4,7 @@
     1.4  config.log
     1.5  config.status
     1.6  Makefile
     1.7 -SDL_mixer.pc
     1.8 -SDL_mixer.qpg
     1.9 -SDL_mixer.spec
    1.10 +SDL2_mixer.pc
    1.11 +SDL2_mixer.spec
    1.12  libtool
    1.13 +build
     2.1 --- a/Makefile.in	Sat Jan 28 10:44:44 2012 -0500
     2.2 +++ b/Makefile.in	Sat Jan 28 10:55:23 2012 -0500
     2.3 @@ -13,7 +13,7 @@
     2.4  mandir	= @mandir@
     2.5  auxdir	= @ac_aux_dir@
     2.6  distpath = $(srcdir)/..
     2.7 -distdir = SDL_mixer-@VERSION@
     2.8 +distdir = SDL2_mixer-@VERSION@
     2.9  distfile = $(distdir).tar.gz
    2.10  
    2.11  @SET_MAKE@
    2.12 @@ -33,13 +33,13 @@
    2.13  SDL_CFLAGS = @SDL_CFLAGS@
    2.14  SDL_LIBS = @SDL_LIBS@
    2.15  
    2.16 -TARGET  = libSDL_mixer.la
    2.17 +TARGET  = libSDL2_mixer.la
    2.18  OBJECTS = @OBJECTS@
    2.19  VERSION_OBJECTS = @VERSION_OBJECTS@
    2.20  PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
    2.21  PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
    2.22  
    2.23 -DIST = Android.mk CHANGES COPYING Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
    2.24 +DIST = Android.mk CHANGES COPYING Makefile.in SDL2_mixer.pc.in README SDL_mixer.h SDL2_mixer.spec SDL2_mixer.spec.in VisualC Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
    2.25  
    2.26  LT_AGE      = @LT_AGE@
    2.27  LT_CURRENT  = @LT_CURRENT@
    2.28 @@ -73,13 +73,13 @@
    2.29  
    2.30  install: all install-hdrs install-lib #install-bin
    2.31  install-hdrs:
    2.32 -	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
    2.33 +	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL2
    2.34  	for src in $(srcdir)/SDL_mixer.h; do \
    2.35  	    file=`echo $$src | sed -e 's|^.*/||'`; \
    2.36 -	    $(INSTALL) -m 644 $$src $(includedir)/SDL/$$file; \
    2.37 +	    $(INSTALL) -m 644 $$src $(includedir)/SDL2/$$file; \
    2.38  	done
    2.39  	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
    2.40 -	$(INSTALL) -m 644 SDL_mixer.pc $(libdir)/pkgconfig/
    2.41 +	$(INSTALL) -m 644 SDL2_mixer.pc $(libdir)/pkgconfig/
    2.42  install-lib: $(objects) $(objects)/$(TARGET)
    2.43  	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
    2.44  	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
    2.45 @@ -92,10 +92,10 @@
    2.46  uninstall-hdrs:
    2.47  	for src in $(srcdir)/SDL_mixer.h; do \
    2.48  	    file=`echo $$src | sed -e 's|^.*/||'`; \
    2.49 -	    rm -f $(includedir)/SDL/$$file; \
    2.50 +	    rm -f $(includedir)/SDL2/$$file; \
    2.51  	done
    2.52 -	-rmdir $(includedir)/SDL
    2.53 -	rm -f $(libdir)/pkgconfig/SDL_mixer.pc
    2.54 +	-rmdir $(includedir)/SDL2
    2.55 +	rm -f $(libdir)/pkgconfig/SDL2_mixer.pc
    2.56  	-rmdir $(libdir)/pkgconfig
    2.57  uninstall-lib:
    2.58  	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
    2.59 @@ -108,9 +108,8 @@
    2.60  
    2.61  distclean: clean
    2.62  	rm -f Makefile
    2.63 -	rm -f SDL_mixer.qpg
    2.64  	rm -f config.status config.cache config.log libtool
    2.65 -	rm -f SDL_mixer.pc
    2.66 +	rm -f SDL2_mixer.pc
    2.67  	rm -rf $(srcdir)/autom4te*
    2.68  	find $(srcdir) \( \
    2.69  	    -name '*~' -o \
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/SDL2_mixer.pc.in	Sat Jan 28 10:55:23 2012 -0500
     3.3 @@ -0,0 +1,12 @@
     3.4 +prefix=@prefix@
     3.5 +exec_prefix=@exec_prefix@
     3.6 +libdir=@libdir@
     3.7 +includedir=@includedir@
     3.8 +
     3.9 +Name: SDL2_mixer
    3.10 +Description: mixer library for Simple DirectMedia Layer
    3.11 +Version: @VERSION@
    3.12 +Requires: sdl2 >= @SDL_VERSION@
    3.13 +Libs: -L${libdir} -lSDL2_mixer
    3.14 +Cflags: -I${includedir}/SDL2
    3.15 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/SDL2_mixer.spec.in	Sat Jan 28 10:55:23 2012 -0500
     4.3 @@ -0,0 +1,64 @@
     4.4 +%define name SDL2_mixer
     4.5 +%define version @VERSION@
     4.6 +%define release 1
     4.7 +
     4.8 +Summary: Simple DirectMedia Layer - Sample Mixer Library
     4.9 +Name: %{name}
    4.10 +Version: %{version}
    4.11 +Release: %{release}
    4.12 +Source0: %{name}-%{version}.tar.gz
    4.13 +License: LGPL
    4.14 +Group: System Environment/Libraries
    4.15 +BuildRoot: /var/tmp/%{name}-buildroot
    4.16 +Prefix: %{_prefix}
    4.17 +
    4.18 +%description
    4.19 +Due to popular demand, here is a simple multi-channel audio mixer.
    4.20 +It supports 4 channels of 16 bit stereo audio, plus a single channel
    4.21 +of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
    4.22 +Tremor, SMPEG MP3, and libmad MP3 libraries.
    4.23 +
    4.24 +%package devel
    4.25 +Summary: Libraries, includes and more to develop SDL applications.
    4.26 +Group: Development/Libraries
    4.27 +Requires: %{name}
    4.28 +
    4.29 +%description devel
    4.30 +Due to popular demand, here is a simple multi-channel audio mixer.
    4.31 +It supports 4 channels of 16 bit stereo audio, plus a single channel
    4.32 +of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
    4.33 +Tremor, SMPEG MP3, and libmad MP3 libraries.
    4.34 +
    4.35 +%prep
    4.36 +%setup 
    4.37 +
    4.38 +%build
    4.39 +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
    4.40 +make
    4.41 +
    4.42 +%install
    4.43 +rm -rf $RPM_BUILD_ROOT
    4.44 +make install prefix=$RPM_BUILD_ROOT/%{prefix}
    4.45 +
    4.46 +%clean
    4.47 +rm -rf $RPM_BUILD_ROOT
    4.48 +
    4.49 +%files
    4.50 +%defattr(-,root,root)
    4.51 +%doc README CHANGES COPYING
    4.52 +%{prefix}/lib/lib*.so.*
    4.53 +
    4.54 +%files devel
    4.55 +%defattr(-,root,root)
    4.56 +%{prefix}/lib/lib*.a
    4.57 +%{prefix}/lib/lib*.la
    4.58 +%{prefix}/lib/lib*.so
    4.59 +%{prefix}/include/*/
    4.60 +%{prefix}/lib/pkgconfig/*.pc
    4.61 +
    4.62 +%changelog
    4.63 +* Wed Jan 19 2000 Sam Lantinga 
    4.64 +- converted to get package information from configure
    4.65 +* Sun Jan 16 2000 Hakan Tandogan <hakan@iconsult.com>
    4.66 +- initial spec file
    4.67 +
     5.1 --- a/SDL_mixer.pc.in	Sat Jan 28 10:44:44 2012 -0500
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,12 +0,0 @@
     5.4 -prefix=@prefix@
     5.5 -exec_prefix=@exec_prefix@
     5.6 -libdir=@libdir@
     5.7 -includedir=@includedir@
     5.8 -
     5.9 -Name: SDL_mixer
    5.10 -Description: mixer library for Simple DirectMedia Layer
    5.11 -Version: @VERSION@
    5.12 -Requires: sdl >= @SDL_VERSION@
    5.13 -Libs: -L${libdir} -lSDL_mixer
    5.14 -Cflags: -I${includedir}/SDL
    5.15 -
     6.1 --- a/SDL_mixer.qpg.in	Sat Jan 28 10:44:44 2012 -0500
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,127 +0,0 @@
     6.4 -<QPG:Generation>
     6.5 -   <QPG:Options>
     6.6 -      <QPG:User unattended="yes" verbosity="0" listfiles="yes"/>
     6.7 -      <QPG:Defaults type="qnx_package"/>
     6.8 -      <QPG:Source></QPG:Source>
     6.9 -      <QPG:Release date="today" number="+"/>
    6.10 -      <QPG:Build></QPG:Build>
    6.11 -      <QPG:FileSorting strip="yes"/>
    6.12 -      <QPG:Package targets="standart"/>
    6.13 -      <QPG:Repository generate="yes"/>
    6.14 -      <QPG:FinalDir></QPG:FinalDir>
    6.15 -      <QPG:Cleanup></QPG:Cleanup>
    6.16 -   </QPG:Options>
    6.17 -
    6.18 -   <QPG:Responsible>
    6.19 -      <QPG:Company>QNX.ORG.RU Community</QPG:Company>
    6.20 -      <QPG:Department></QPG:Department>
    6.21 -      <QPG:Group></QPG:Group>
    6.22 -      <QPG:Team>QNX.ORG.RU Team</QPG:Team>
    6.23 -      <QPG:Employee>Mike Gorchak</QPG:Employee>
    6.24 -      <QPG:EmailAddress>mike@malva.ua</QPG:EmailAddress>
    6.25 -   </QPG:Responsible>
    6.26 -
    6.27 -   <QPG:Values>
    6.28 -      <QPG:Files>
    6.29 -         <QPG:Add file="./COPYING" install="LicenseUrl/" handling="repdata"/>
    6.30 -         <QPG:Add permissions="0755" file="./.libs/libSDL_mixer-1.2.so.2" install="/opt/lib/"/>
    6.31 -         <QPG:Add filetype="symlink" file="libSDL_mixer.so" install="/opt/lib/" linkto="libSDL_mixer-1.2.so.2"/>
    6.32 -         <QPG:Add filetype="symlink" file="libSDL_mixer-1.1.so.2" install="/opt/lib/" linkto="libSDL_mixer-1.2.so.2"/>
    6.33 -         <QPG:Add filetype="symlink" file="libSDL_mixer-1.0.so.2" install="/opt/lib/" linkto="libSDL_mixer-1.2.so.2"/>
    6.34 -         <QPG:Add permissions="0644" file="./.libs/libSDL_mixer.a" install="/opt/lib/"/>
    6.35 -         <QPG:Add permissions="0644" file="./.libs/libSDL_mixer.lai" install="/opt/lib/libSDL_mixer.la"/>
    6.36 -         <QPG:Add permissions="0644" file="./SDL_mixer.h" install="/opt/include/SDL/"/>
    6.37 -         <QPG:Add permissions="0644" file="./CHANGES" install="/usr/doc/SDL12_mixer/"/>
    6.38 -         <QPG:Add permissions="0644" file="./COPYING" install="/usr/doc/SDL12_mixer/"/>
    6.39 -         <QPG:Add permissions="0644" file="./README" install="/usr/doc/SDL12_mixer/"/>
    6.40 -      </QPG:Files>
    6.41 -      <QPG:PackageFilter>
    6.42 -         <QPM:PackageManifest>
    6.43 -
    6.44 -            <QPM:PackageDescription>
    6.45 -               <QPM:PackageType>Library</QPM:PackageType>
    6.46 -               <QPM:PackageName>SDL_mixer</QPM:PackageName>
    6.47 -               <QPM:PackageReleaseNumber>1</QPM:PackageReleaseNumber>
    6.48 -               <QPM:PackageRepository>http://qnx.org.ru/repository</QPM:PackageRepository>
    6.49 -               <QPM:FileVersion>2.0</QPM:FileVersion>
    6.50 -            </QPM:PackageDescription>
    6.51 -
    6.52 -            <QPM:ProductDescription>
    6.53 -               <QPM:ProductName>SDL_mixer</QPM:ProductName>
    6.54 -               <QPM:ProductIdentifier>SDL_mixer</QPM:ProductIdentifier>
    6.55 -               <QPM:ProductEmail>slouken@libsdl.org</QPM:ProductEmail>
    6.56 -               <QPM:VendorName>public</QPM:VendorName>
    6.57 -               <QPM:VendorInstallName>public</QPM:VendorInstallName>
    6.58 -               <QPM:VendorURL>http://www.libsdl.org</QPM:VendorURL>
    6.59 -               <QPM:VendorEmbedURL/>
    6.60 -               <QPM:VendorEmail>slouken@libsdl.org</QPM:VendorEmail>
    6.61 -               <QPM:AuthorName>Sam Lantinga, Stephane Peter and Ryan Gordon</QPM:AuthorName>
    6.62 -               <QPM:AuthorURL>http://www.libsdl.org</QPM:AuthorURL>
    6.63 -               <QPM:AuthorEmbedURL/>
    6.64 -               <QPM:AuthorEmail>slouken@libsdl.org</QPM:AuthorEmail>
    6.65 -               <QPM:ProductIconSmall/>
    6.66 -               <QPM:ProductIconLarge/>
    6.67 -               <QPM:ProductDescriptionShort>SDL_mixer - is simple multi-channel audio mixer. The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, and can load MIDI files via Timidity and the various music formats via MikMod.</QPM:ProductDescriptionShort>
    6.68 -               <QPM:ProductDescriptionLong>SDL_mixer - is simple multi-channel audio mixer. The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, and can load MIDI files via Timidity and the following music formats via MikMod: .MOD .S3M .IT .XM.</QPM:ProductDescriptionLong>
    6.69 -               <QPM:ProductDescriptionURL>http://www.libsdl.org/projects/SDL_mixer</QPM:ProductDescriptionURL>
    6.70 -               <QPM:ProductDescriptionEmbedURL/>
    6.71 -            </QPM:ProductDescription>
    6.72 -
    6.73 -            <QPM:ReleaseDescription>
    6.74 -               <QPM:ReleaseVersion>@VERSION@</QPM:ReleaseVersion>
    6.75 -               <QPM:ReleaseUrgency>High</QPM:ReleaseUrgency>
    6.76 -               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
    6.77 -               <QPM:ReleaseNoteMinor/>
    6.78 -               <QPM:ReleaseNoteMajor/>
    6.79 -               <QPM:ReleaseBuild>1</QPM:ReleaseBuild>
    6.80 -               <QPM:CountryExclude/>
    6.81 -               <QPM:ReleaseCopyright>GNU Lesser General Public License</QPM:ReleaseCopyright>
    6.82 -            </QPM:ReleaseDescription>
    6.83 -
    6.84 -            <QPM:ContentDescription>
    6.85 -               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
    6.86 -               <QPM:ContentKeyword>SDL, music, sound, WAV, VOC, MIDI, MID, MOD, S3M, XM, IT</QPM:ContentKeyword>
    6.87 -               <QPM:TargetOS>qnx6</QPM:TargetOS>
    6.88 -               <QPM:HostOS>none</QPM:HostOS>
    6.89 -               <QPM:DisplayEnvironment xmlmultiple="true">Console</QPM:DisplayEnvironment>
    6.90 -               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
    6.91 -               <QPM:TargetAudience xmlmultiple="true">User</QPM:TargetAudience>
    6.92 -            </QPM:ContentDescription>
    6.93 -            <QPM:LicenseUrl>repdata://LicenseUrl/COPYING</QPM:LicenseUrl>
    6.94 -         </QPM:PackageManifest>
    6.95 -      </QPG:PackageFilter>
    6.96 -
    6.97 -      <QPG:PackageFilter proc="none" target="none">
    6.98 -         <QPM:PackageManifest>
    6.99 -            <QPM:ProductInstallationDependencies>
   6.100 -               <QPM:ProductRequirements></QPM:ProductRequirements>
   6.101 -            </QPM:ProductInstallationDependencies>
   6.102 -         </QPM:PackageManifest>
   6.103 -      </QPG:PackageFilter>
   6.104 -
   6.105 -      <QPG:PackageFilter proc="x86" target="none">
   6.106 -         <QPM:PackageManifest>
   6.107 -            <QPM:ProductInstallationDependencies>
   6.108 -               <QPM:ProductRequirements></QPM:ProductRequirements>
   6.109 -            </QPM:ProductInstallationDependencies>
   6.110 -         </QPM:PackageManifest>
   6.111 -      </QPG:PackageFilter>
   6.112 -
   6.113 -      <QPG:PackageFilter proc="none" target="x86">
   6.114 -         <QPM:PackageManifest>
   6.115 -            <QPM:ProductInstallationDependencies>
   6.116 -               <QPM:ProductRequirements></QPM:ProductRequirements>
   6.117 -            </QPM:ProductInstallationDependencies>
   6.118 -         </QPM:PackageManifest>
   6.119 -      </QPG:PackageFilter>
   6.120 -
   6.121 -      <QPG:PackageFilter proc="x86" target="x86">
   6.122 -         <QPM:PackageManifest>
   6.123 -            <QPM:ProductInstallationDependencies>
   6.124 -               <QPM:ProductRequirements></QPM:ProductRequirements>
   6.125 -            </QPM:ProductInstallationDependencies>
   6.126 -         </QPM:PackageManifest>
   6.127 -      </QPG:PackageFilter>
   6.128 -
   6.129 -   </QPG:Values>
   6.130 -</QPG:Generation>
     7.1 --- a/SDL_mixer.spec.in	Sat Jan 28 10:44:44 2012 -0500
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,64 +0,0 @@
     7.4 -%define name SDL_mixer
     7.5 -%define version @VERSION@
     7.6 -%define release 1
     7.7 -
     7.8 -Summary: Simple DirectMedia Layer - Sample Mixer Library
     7.9 -Name: %{name}
    7.10 -Version: %{version}
    7.11 -Release: %{release}
    7.12 -Source0: %{name}-%{version}.tar.gz
    7.13 -License: LGPL
    7.14 -Group: System Environment/Libraries
    7.15 -BuildRoot: /var/tmp/%{name}-buildroot
    7.16 -Prefix: %{_prefix}
    7.17 -
    7.18 -%description
    7.19 -Due to popular demand, here is a simple multi-channel audio mixer.
    7.20 -It supports 4 channels of 16 bit stereo audio, plus a single channel
    7.21 -of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
    7.22 -Tremor, SMPEG MP3, and libmad MP3 libraries.
    7.23 -
    7.24 -%package devel
    7.25 -Summary: Libraries, includes and more to develop SDL applications.
    7.26 -Group: Development/Libraries
    7.27 -Requires: %{name}
    7.28 -
    7.29 -%description devel
    7.30 -Due to popular demand, here is a simple multi-channel audio mixer.
    7.31 -It supports 4 channels of 16 bit stereo audio, plus a single channel
    7.32 -of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
    7.33 -Tremor, SMPEG MP3, and libmad MP3 libraries.
    7.34 -
    7.35 -%prep
    7.36 -%setup 
    7.37 -
    7.38 -%build
    7.39 -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
    7.40 -make
    7.41 -
    7.42 -%install
    7.43 -rm -rf $RPM_BUILD_ROOT
    7.44 -make install prefix=$RPM_BUILD_ROOT/%{prefix}
    7.45 -
    7.46 -%clean
    7.47 -rm -rf $RPM_BUILD_ROOT
    7.48 -
    7.49 -%files
    7.50 -%defattr(-,root,root)
    7.51 -%doc README CHANGES COPYING
    7.52 -%{prefix}/lib/lib*.so.*
    7.53 -
    7.54 -%files devel
    7.55 -%defattr(-,root,root)
    7.56 -%{prefix}/lib/lib*.a
    7.57 -%{prefix}/lib/lib*.la
    7.58 -%{prefix}/lib/lib*.so
    7.59 -%{prefix}/include/SDL/
    7.60 -%{prefix}/lib/pkgconfig/*.pc
    7.61 -
    7.62 -%changelog
    7.63 -* Wed Jan 19 2000 Sam Lantinga 
    7.64 -- converted to get package information from configure
    7.65 -* Sun Jan 16 2000 Hakan Tandogan <hakan@iconsult.com>
    7.66 -- initial spec file
    7.67 -
     8.1 --- a/acinclude/sdl.m4	Sat Jan 28 10:44:44 2012 -0500
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,203 +0,0 @@
     8.4 -# Configure paths for SDL
     8.5 -# Sam Lantinga 9/21/99
     8.6 -# stolen from Manish Singh
     8.7 -# stolen back from Frank Belew
     8.8 -# stolen from Manish Singh
     8.9 -# Shamelessly stolen from Owen Taylor
    8.10 -
    8.11 -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
    8.12 -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
    8.13 -dnl
    8.14 -AC_DEFUN([AM_PATH_SDL],
    8.15 -[dnl 
    8.16 -dnl Get the cflags and libraries from the sdl-config script
    8.17 -dnl
    8.18 -AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
    8.19 -            sdl_prefix="$withval", sdl_prefix="")
    8.20 -AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
    8.21 -            sdl_exec_prefix="$withval", sdl_exec_prefix="")
    8.22 -AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
    8.23 -		    , enable_sdltest=yes)
    8.24 -
    8.25 -  min_sdl_version=ifelse([$1], ,1.2.0,$1)
    8.26 -
    8.27 -  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
    8.28 -    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
    8.29 -           [sdl_pc=yes],
    8.30 -           [dnl
    8.31 -             AC_MSG_RESULT(no)
    8.32 -             sdl_pc=no
    8.33 -           ])
    8.34 -  else
    8.35 -    sdl_pc=no
    8.36 -    if test x$sdl_exec_prefix != x ; then
    8.37 -      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
    8.38 -      if test x${SDL_CONFIG+set} != xset ; then
    8.39 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    8.40 -      fi
    8.41 -    fi
    8.42 -    if test x$sdl_prefix != x ; then
    8.43 -      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    8.44 -      if test x${SDL_CONFIG+set} != xset ; then
    8.45 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    8.46 -      fi
    8.47 -    fi
    8.48 -  fi
    8.49 -
    8.50 -  if test "x$sdl_pc" = xyes ; then
    8.51 -    no_sdl=""
    8.52 -    SDL_CONFIG="pkg-config sdl"
    8.53 -  else
    8.54 -    as_save_PATH="$PATH"
    8.55 -    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
    8.56 -      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    8.57 -    fi
    8.58 -    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
    8.59 -    PATH="$as_save_PATH"
    8.60 -    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
    8.61 -    no_sdl=""
    8.62 -
    8.63 -    if test "$SDL_CONFIG" = "no" ; then
    8.64 -      no_sdl=yes
    8.65 -    else
    8.66 -      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    8.67 -      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    8.68 -
    8.69 -      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
    8.70 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    8.71 -      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
    8.72 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    8.73 -      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    8.74 -             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    8.75 -      if test "x$enable_sdltest" = "xyes" ; then
    8.76 -        ac_save_CFLAGS="$CFLAGS"
    8.77 -        ac_save_CXXFLAGS="$CXXFLAGS"
    8.78 -        ac_save_LIBS="$LIBS"
    8.79 -        CFLAGS="$CFLAGS $SDL_CFLAGS"
    8.80 -        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    8.81 -        LIBS="$LIBS $SDL_LIBS"
    8.82 -dnl
    8.83 -dnl Now check if the installed SDL is sufficiently new. (Also sanity
    8.84 -dnl checks the results of sdl-config to some extent
    8.85 -dnl
    8.86 -      rm -f conf.sdltest
    8.87 -      AC_TRY_RUN([
    8.88 -#include <stdio.h>
    8.89 -#include <stdlib.h>
    8.90 -#include <string.h>
    8.91 -#include "SDL.h"
    8.92 -
    8.93 -char*
    8.94 -my_strdup (char *str)
    8.95 -{
    8.96 -  char *new_str;
    8.97 -  
    8.98 -  if (str)
    8.99 -    {
   8.100 -      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
   8.101 -      strcpy (new_str, str);
   8.102 -    }
   8.103 -  else
   8.104 -    new_str = NULL;
   8.105 -  
   8.106 -  return new_str;
   8.107 -}
   8.108 -
   8.109 -int main (int argc, char *argv[])
   8.110 -{
   8.111 -  int major, minor, micro;
   8.112 -  char *tmp_version;
   8.113 -
   8.114 -  /* This hangs on some systems (?)
   8.115 -  system ("touch conf.sdltest");
   8.116 -  */
   8.117 -  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
   8.118 -
   8.119 -  /* HP/UX 9 (%@#!) writes to sscanf strings */
   8.120 -  tmp_version = my_strdup("$min_sdl_version");
   8.121 -  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
   8.122 -     printf("%s, bad version string\n", "$min_sdl_version");
   8.123 -     exit(1);
   8.124 -   }
   8.125 -
   8.126 -   if (($sdl_major_version > major) ||
   8.127 -      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
   8.128 -      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
   8.129 -    {
   8.130 -      return 0;
   8.131 -    }
   8.132 -  else
   8.133 -    {
   8.134 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   8.135 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
   8.136 -      printf("*** best to upgrade to the required version.\n");
   8.137 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
   8.138 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
   8.139 -      printf("*** config.cache before re-running configure\n");
   8.140 -      return 1;
   8.141 -    }
   8.142 -}
   8.143 -
   8.144 -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
   8.145 -        CFLAGS="$ac_save_CFLAGS"
   8.146 -        CXXFLAGS="$ac_save_CXXFLAGS"
   8.147 -        LIBS="$ac_save_LIBS"
   8.148 -      fi
   8.149 -    fi
   8.150 -    if test "x$no_sdl" = x ; then
   8.151 -      AC_MSG_RESULT(yes)
   8.152 -    else
   8.153 -      AC_MSG_RESULT(no)
   8.154 -    fi
   8.155 -  fi
   8.156 -  if test "x$no_sdl" = x ; then
   8.157 -     ifelse([$2], , :, [$2])
   8.158 -  else
   8.159 -     if test "$SDL_CONFIG" = "no" ; then
   8.160 -       echo "*** The sdl-config script installed by SDL could not be found"
   8.161 -       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   8.162 -       echo "*** your path, or set the SDL_CONFIG environment variable to the"
   8.163 -       echo "*** full path to sdl-config."
   8.164 -     else
   8.165 -       if test -f conf.sdltest ; then
   8.166 -        :
   8.167 -       else
   8.168 -          echo "*** Could not run SDL test program, checking why..."
   8.169 -          CFLAGS="$CFLAGS $SDL_CFLAGS"
   8.170 -          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   8.171 -          LIBS="$LIBS $SDL_LIBS"
   8.172 -          AC_TRY_LINK([
   8.173 -#include <stdio.h>
   8.174 -#include "SDL.h"
   8.175 -
   8.176 -int main(int argc, char *argv[])
   8.177 -{ return 0; }
   8.178 -#undef  main
   8.179 -#define main K_and_R_C_main
   8.180 -],      [ return 0; ],
   8.181 -        [ echo "*** The test program compiled, but did not run. This usually means"
   8.182 -          echo "*** that the run-time linker is not finding SDL or finding the wrong"
   8.183 -          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
   8.184 -          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
   8.185 -          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
   8.186 -          echo "*** is required on your system"
   8.187 -	  echo "***"
   8.188 -          echo "*** If you have an old version installed, it is best to remove it, although"
   8.189 -          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
   8.190 -        [ echo "*** The test program failed to compile or link. See the file config.log for the"
   8.191 -          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
   8.192 -          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
   8.193 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
   8.194 -          CFLAGS="$ac_save_CFLAGS"
   8.195 -          CXXFLAGS="$ac_save_CXXFLAGS"
   8.196 -          LIBS="$ac_save_LIBS"
   8.197 -       fi
   8.198 -     fi
   8.199 -     SDL_CFLAGS=""
   8.200 -     SDL_LIBS=""
   8.201 -     ifelse([$3], , :, [$3])
   8.202 -  fi
   8.203 -  AC_SUBST(SDL_CFLAGS)
   8.204 -  AC_SUBST(SDL_LIBS)
   8.205 -  rm -f conf.sdltest
   8.206 -])
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/acinclude/sdl2.m4	Sat Jan 28 10:55:23 2012 -0500
     9.3 @@ -0,0 +1,202 @@
     9.4 +# Configure paths for SDL
     9.5 +# Sam Lantinga 9/21/99
     9.6 +# stolen from Manish Singh
     9.7 +# stolen back from Frank Belew
     9.8 +# stolen from Manish Singh
     9.9 +# Shamelessly stolen from Owen Taylor
    9.10 +
    9.11 +# serial 1
    9.12 +
    9.13 +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
    9.14 +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
    9.15 +dnl
    9.16 +AC_DEFUN([AM_PATH_SDL],
    9.17 +[dnl 
    9.18 +dnl Get the cflags and libraries from the sdl2-config script
    9.19 +dnl
    9.20 +AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
    9.21 +            sdl_prefix="$withval", sdl_prefix="")
    9.22 +AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
    9.23 +            sdl_exec_prefix="$withval", sdl_exec_prefix="")
    9.24 +AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
    9.25 +		    , enable_sdltest=yes)
    9.26 +
    9.27 +  min_sdl_version=ifelse([$1], ,0.9.0,$1)
    9.28 +
    9.29 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
    9.30 +    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
    9.31 +           [sdl_pc=yes],
    9.32 +           [sdl_pc=no])
    9.33 +  else
    9.34 +    sdl_pc=no
    9.35 +    if test x$sdl_exec_prefix != x ; then
    9.36 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
    9.37 +      if test x${SDL_CONFIG+set} != xset ; then
    9.38 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
    9.39 +      fi
    9.40 +    fi
    9.41 +    if test x$sdl_prefix != x ; then
    9.42 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    9.43 +      if test x${SDL_CONFIG+set} != xset ; then
    9.44 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
    9.45 +      fi
    9.46 +    fi
    9.47 +  fi
    9.48 +
    9.49 +  if test "x$sdl_pc" = xyes ; then
    9.50 +    no_sdl=""
    9.51 +    SDL_CONFIG="pkg-config sdl2"
    9.52 +  else
    9.53 +    as_save_PATH="$PATH"
    9.54 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
    9.55 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    9.56 +    fi
    9.57 +    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
    9.58 +    PATH="$as_save_PATH"
    9.59 +    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
    9.60 +    no_sdl=""
    9.61 +
    9.62 +    if test "$SDL_CONFIG" = "no" ; then
    9.63 +      no_sdl=yes
    9.64 +    else
    9.65 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    9.66 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    9.67 +
    9.68 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
    9.69 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    9.70 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
    9.71 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    9.72 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    9.73 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    9.74 +      if test "x$enable_sdltest" = "xyes" ; then
    9.75 +        ac_save_CFLAGS="$CFLAGS"
    9.76 +        ac_save_CXXFLAGS="$CXXFLAGS"
    9.77 +        ac_save_LIBS="$LIBS"
    9.78 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
    9.79 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    9.80 +        LIBS="$LIBS $SDL_LIBS"
    9.81 +dnl
    9.82 +dnl Now check if the installed SDL is sufficiently new. (Also sanity
    9.83 +dnl checks the results of sdl2-config to some extent
    9.84 +dnl
    9.85 +      rm -f conf.sdltest
    9.86 +      AC_TRY_RUN([
    9.87 +#include <stdio.h>
    9.88 +#include <stdlib.h>
    9.89 +#include <string.h>
    9.90 +#include "SDL.h"
    9.91 +
    9.92 +char*
    9.93 +my_strdup (char *str)
    9.94 +{
    9.95 +  char *new_str;
    9.96 +  
    9.97 +  if (str)
    9.98 +    {
    9.99 +      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
   9.100 +      strcpy (new_str, str);
   9.101 +    }
   9.102 +  else
   9.103 +    new_str = NULL;
   9.104 +  
   9.105 +  return new_str;
   9.106 +}
   9.107 +
   9.108 +int main (int argc, char *argv[])
   9.109 +{
   9.110 +  int major, minor, micro;
   9.111 +  char *tmp_version;
   9.112 +
   9.113 +  /* This hangs on some systems (?)
   9.114 +  system ("touch conf.sdltest");
   9.115 +  */
   9.116 +  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
   9.117 +
   9.118 +  /* HP/UX 9 (%@#!) writes to sscanf strings */
   9.119 +  tmp_version = my_strdup("$min_sdl_version");
   9.120 +  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
   9.121 +     printf("%s, bad version string\n", "$min_sdl_version");
   9.122 +     exit(1);
   9.123 +   }
   9.124 +
   9.125 +   if (($sdl_major_version > major) ||
   9.126 +      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
   9.127 +      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
   9.128 +    {
   9.129 +      return 0;
   9.130 +    }
   9.131 +  else
   9.132 +    {
   9.133 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   9.134 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
   9.135 +      printf("*** best to upgrade to the required version.\n");
   9.136 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
   9.137 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
   9.138 +      printf("*** config.cache before re-running configure\n");
   9.139 +      return 1;
   9.140 +    }
   9.141 +}
   9.142 +
   9.143 +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
   9.144 +        CFLAGS="$ac_save_CFLAGS"
   9.145 +        CXXFLAGS="$ac_save_CXXFLAGS"
   9.146 +        LIBS="$ac_save_LIBS"
   9.147 +      fi
   9.148 +    fi
   9.149 +    if test "x$no_sdl" = x ; then
   9.150 +      AC_MSG_RESULT(yes)
   9.151 +    else
   9.152 +      AC_MSG_RESULT(no)
   9.153 +    fi
   9.154 +  fi
   9.155 +  if test "x$no_sdl" = x ; then
   9.156 +     ifelse([$2], , :, [$2])
   9.157 +  else
   9.158 +     if test "$SDL_CONFIG" = "no" ; then
   9.159 +       echo "*** The sdl2-config script installed by SDL could not be found"
   9.160 +       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   9.161 +       echo "*** your path, or set the SDL_CONFIG environment variable to the"
   9.162 +       echo "*** full path to sdl2-config."
   9.163 +     else
   9.164 +       if test -f conf.sdltest ; then
   9.165 +        :
   9.166 +       else
   9.167 +          echo "*** Could not run SDL test program, checking why..."
   9.168 +          CFLAGS="$CFLAGS $SDL_CFLAGS"
   9.169 +          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   9.170 +          LIBS="$LIBS $SDL_LIBS"
   9.171 +          AC_TRY_LINK([
   9.172 +#include <stdio.h>
   9.173 +#include "SDL.h"
   9.174 +
   9.175 +int main(int argc, char *argv[])
   9.176 +{ return 0; }
   9.177 +#undef  main
   9.178 +#define main K_and_R_C_main
   9.179 +],      [ return 0; ],
   9.180 +        [ echo "*** The test program compiled, but did not run. This usually means"
   9.181 +          echo "*** that the run-time linker is not finding SDL or finding the wrong"
   9.182 +          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
   9.183 +          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
   9.184 +          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
   9.185 +          echo "*** is required on your system"
   9.186 +	  echo "***"
   9.187 +          echo "*** If you have an old version installed, it is best to remove it, although"
   9.188 +          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
   9.189 +        [ echo "*** The test program failed to compile or link. See the file config.log for the"
   9.190 +          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
   9.191 +          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
   9.192 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
   9.193 +          CFLAGS="$ac_save_CFLAGS"
   9.194 +          CXXFLAGS="$ac_save_CXXFLAGS"
   9.195 +          LIBS="$ac_save_LIBS"
   9.196 +       fi
   9.197 +     fi
   9.198 +     SDL_CFLAGS=""
   9.199 +     SDL_LIBS=""
   9.200 +     ifelse([$3], , :, [$3])
   9.201 +  fi
   9.202 +  AC_SUBST(SDL_CFLAGS)
   9.203 +  AC_SUBST(SDL_LIBS)
   9.204 +  rm -f conf.sdltest
   9.205 +])
    10.1 --- a/aclocal.m4	Sat Jan 28 10:44:44 2012 -0500
    10.2 +++ b/aclocal.m4	Sat Jan 28 10:55:23 2012 -0500
    10.3 @@ -8951,12 +8951,14 @@
    10.4  # stolen from Manish Singh
    10.5  # Shamelessly stolen from Owen Taylor
    10.6  
    10.7 +# serial 1
    10.8 +
    10.9  dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
   10.10  dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
   10.11  dnl
   10.12  AC_DEFUN([AM_PATH_SDL],
   10.13  [dnl 
   10.14 -dnl Get the cflags and libraries from the sdl-config script
   10.15 +dnl Get the cflags and libraries from the sdl2-config script
   10.16  dnl
   10.17  AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
   10.18              sdl_prefix="$withval", sdl_prefix="")
   10.19 @@ -8965,40 +8967,37 @@
   10.20  AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
   10.21  		    , enable_sdltest=yes)
   10.22  
   10.23 -  min_sdl_version=ifelse([$1], ,1.2.0,$1)
   10.24 +  min_sdl_version=ifelse([$1], ,0.9.0,$1)
   10.25  
   10.26    if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   10.27 -    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
   10.28 +    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
   10.29             [sdl_pc=yes],
   10.30 -           [dnl
   10.31 -             AC_MSG_RESULT(no)
   10.32 -             sdl_pc=no
   10.33 -           ])
   10.34 +           [sdl_pc=no])
   10.35    else
   10.36      sdl_pc=no
   10.37      if test x$sdl_exec_prefix != x ; then
   10.38        sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   10.39        if test x${SDL_CONFIG+set} != xset ; then
   10.40 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   10.41 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   10.42        fi
   10.43      fi
   10.44      if test x$sdl_prefix != x ; then
   10.45        sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   10.46        if test x${SDL_CONFIG+set} != xset ; then
   10.47 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
   10.48 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   10.49        fi
   10.50      fi
   10.51    fi
   10.52  
   10.53    if test "x$sdl_pc" = xyes ; then
   10.54      no_sdl=""
   10.55 -    SDL_CONFIG="pkg-config sdl"
   10.56 +    SDL_CONFIG="pkg-config sdl2"
   10.57    else
   10.58      as_save_PATH="$PATH"
   10.59      if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   10.60        PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   10.61      fi
   10.62 -    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
   10.63 +    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
   10.64      PATH="$as_save_PATH"
   10.65      AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   10.66      no_sdl=""
   10.67 @@ -9024,7 +9023,7 @@
   10.68          LIBS="$LIBS $SDL_LIBS"
   10.69  dnl
   10.70  dnl Now check if the installed SDL is sufficiently new. (Also sanity
   10.71 -dnl checks the results of sdl-config to some extent
   10.72 +dnl checks the results of sdl2-config to some extent
   10.73  dnl
   10.74        rm -f conf.sdltest
   10.75        AC_TRY_RUN([
   10.76 @@ -9074,11 +9073,11 @@
   10.77      }
   10.78    else
   10.79      {
   10.80 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   10.81 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
   10.82 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   10.83 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
   10.84        printf("*** best to upgrade to the required version.\n");
   10.85 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
   10.86 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
   10.87 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
   10.88 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
   10.89        printf("*** config.cache before re-running configure\n");
   10.90        return 1;
   10.91      }
   10.92 @@ -9100,10 +9099,10 @@
   10.93       ifelse([$2], , :, [$2])
   10.94    else
   10.95       if test "$SDL_CONFIG" = "no" ; then
   10.96 -       echo "*** The sdl-config script installed by SDL could not be found"
   10.97 +       echo "*** The sdl2-config script installed by SDL could not be found"
   10.98         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   10.99         echo "*** your path, or set the SDL_CONFIG environment variable to the"
  10.100 -       echo "*** full path to sdl-config."
  10.101 +       echo "*** full path to sdl2-config."
  10.102       else
  10.103         if test -f conf.sdltest ; then
  10.104          :
  10.105 @@ -9133,7 +9132,7 @@
  10.106          [ echo "*** The test program failed to compile or link. See the file config.log for the"
  10.107            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  10.108            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  10.109 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
  10.110 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
  10.111            CFLAGS="$ac_save_CFLAGS"
  10.112            CXXFLAGS="$ac_save_CXXFLAGS"
  10.113            LIBS="$ac_save_LIBS"
    11.1 --- a/configure	Sat Jan 28 10:44:44 2012 -0500
    11.2 +++ b/configure	Sat Jan 28 10:55:23 2012 -0500
    11.3 @@ -11864,7 +11864,7 @@
    11.4      done
    11.5  }
    11.6  
    11.7 -SDL_VERSION=1.2.10
    11.8 +SDL_VERSION=2.0.0
    11.9  
   11.10  
   11.11  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
   11.12 @@ -12022,12 +12022,12 @@
   11.13          pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
   11.14      else
   11.15          if test -n "$PKG_CONFIG" && \
   11.16 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= \$min_sdl_version\"") >&5
   11.17 -  ($PKG_CONFIG --exists --print-errors "sdl >= $min_sdl_version") 2>&5
   11.18 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
   11.19 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
   11.20    ac_status=$?
   11.21    echo "$as_me:$LINENO: \$? = $ac_status" >&5
   11.22    (exit $ac_status); }; then
   11.23 -  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $min_sdl_version" 2>/dev/null`
   11.24 +  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
   11.25  else
   11.26    pkg_failed=yes
   11.27  fi
   11.28 @@ -12040,12 +12040,12 @@
   11.29          pkg_cv_SDL_LIBS="$SDL_LIBS"
   11.30      else
   11.31          if test -n "$PKG_CONFIG" && \
   11.32 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl >= \$min_sdl_version\"") >&5
   11.33 -  ($PKG_CONFIG --exists --print-errors "sdl >= $min_sdl_version") 2>&5
   11.34 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
   11.35 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
   11.36    ac_status=$?
   11.37    echo "$as_me:$LINENO: \$? = $ac_status" >&5
   11.38    (exit $ac_status); }; then
   11.39 -  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $min_sdl_version" 2>/dev/null`
   11.40 +  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
   11.41  else
   11.42    pkg_failed=yes
   11.43  fi
   11.44 @@ -12064,24 +12064,18 @@
   11.45          _pkg_short_errors_supported=no
   11.46  fi
   11.47          if test $_pkg_short_errors_supported = yes; then
   11.48 -	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl >= $min_sdl_version"`
   11.49 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl2 >= $min_sdl_version"`
   11.50          else
   11.51 -	        SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl >= $min_sdl_version"`
   11.52 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl2 >= $min_sdl_version"`
   11.53          fi
   11.54  	# Put the nasty error message in config.log where it belongs
   11.55  	echo "$SDL_PKG_ERRORS" >&5
   11.56  
   11.57  	{ echo "$as_me:$LINENO: result: no" >&5
   11.58  echo "${ECHO_T}no" >&6; }
   11.59 -                             { echo "$as_me:$LINENO: result: no" >&5
   11.60 -echo "${ECHO_T}no" >&6; }
   11.61 -             sdl_pc=no
   11.62 -
   11.63 +                sdl_pc=no
   11.64  elif test $pkg_failed = untried; then
   11.65 -	             { echo "$as_me:$LINENO: result: no" >&5
   11.66 -echo "${ECHO_T}no" >&6; }
   11.67 -             sdl_pc=no
   11.68 -
   11.69 +	sdl_pc=no
   11.70  else
   11.71  	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
   11.72  	SDL_LIBS=$pkg_cv_SDL_LIBS
   11.73 @@ -12094,27 +12088,27 @@
   11.74      if test x$sdl_exec_prefix != x ; then
   11.75        sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   11.76        if test x${SDL_CONFIG+set} != xset ; then
   11.77 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   11.78 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   11.79        fi
   11.80      fi
   11.81      if test x$sdl_prefix != x ; then
   11.82        sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   11.83        if test x${SDL_CONFIG+set} != xset ; then
   11.84 -        SDL_CONFIG=$sdl_prefix/bin/sdl-config
   11.85 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   11.86        fi
   11.87      fi
   11.88    fi
   11.89  
   11.90    if test "x$sdl_pc" = xyes ; then
   11.91      no_sdl=""
   11.92 -    SDL_CONFIG="pkg-config sdl"
   11.93 +    SDL_CONFIG="pkg-config sdl2"
   11.94    else
   11.95      as_save_PATH="$PATH"
   11.96      if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   11.97        PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   11.98      fi
   11.99 -    # Extract the first word of "sdl-config", so it can be a program name with args.
  11.100 -set dummy sdl-config; ac_word=$2
  11.101 +    # Extract the first word of "sdl2-config", so it can be a program name with args.
  11.102 +set dummy sdl2-config; ac_word=$2
  11.103  { echo "$as_me:$LINENO: checking for $ac_word" >&5
  11.104  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  11.105  if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
  11.106 @@ -12235,11 +12229,11 @@
  11.107      }
  11.108    else
  11.109      {
  11.110 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  11.111 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
  11.112 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
  11.113 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
  11.114        printf("*** best to upgrade to the required version.\n");
  11.115 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
  11.116 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
  11.117 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
  11.118 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
  11.119        printf("*** config.cache before re-running configure\n");
  11.120        return 1;
  11.121      }
  11.122 @@ -12297,10 +12291,10 @@
  11.123       :
  11.124    else
  11.125       if test "$SDL_CONFIG" = "no" ; then
  11.126 -       echo "*** The sdl-config script installed by SDL could not be found"
  11.127 +       echo "*** The sdl2-config script installed by SDL could not be found"
  11.128         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
  11.129         echo "*** your path, or set the SDL_CONFIG environment variable to the"
  11.130 -       echo "*** full path to sdl-config."
  11.131 +       echo "*** full path to sdl2-config."
  11.132       else
  11.133         if test -f conf.sdltest ; then
  11.134          :
  11.135 @@ -12366,7 +12360,7 @@
  11.136  	 echo "*** The test program failed to compile or link. See the file config.log for the"
  11.137            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
  11.138            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
  11.139 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
  11.140 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
  11.141  fi
  11.142  
  11.143  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  11.144 @@ -16838,7 +16832,7 @@
  11.145    $ac_cs_success || { (exit 1); exit 1; }
  11.146  fi
  11.147  
  11.148 -ac_config_files="$ac_config_files Makefile SDL_mixer.spec SDL_mixer.qpg SDL_mixer.pc"
  11.149 +ac_config_files="$ac_config_files Makefile SDL2_mixer.spec SDL2_mixer.pc"
  11.150  
  11.151  ac_config_commands="$ac_config_commands default"
  11.152  
  11.153 @@ -17683,9 +17677,8 @@
  11.154    case $ac_config_target in
  11.155      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
  11.156      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  11.157 -    "SDL_mixer.spec") CONFIG_FILES="$CONFIG_FILES SDL_mixer.spec" ;;
  11.158 -    "SDL_mixer.qpg") CONFIG_FILES="$CONFIG_FILES SDL_mixer.qpg" ;;
  11.159 -    "SDL_mixer.pc") CONFIG_FILES="$CONFIG_FILES SDL_mixer.pc" ;;
  11.160 +    "SDL2_mixer.spec") CONFIG_FILES="$CONFIG_FILES SDL2_mixer.spec" ;;
  11.161 +    "SDL2_mixer.pc") CONFIG_FILES="$CONFIG_FILES SDL2_mixer.pc" ;;
  11.162      "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
  11.163  
  11.164    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    12.1 --- a/configure.in	Sat Jan 28 10:44:44 2012 -0500
    12.2 +++ b/configure.in	Sat Jan 28 10:55:23 2012 -0500
    12.3 @@ -196,7 +196,7 @@
    12.4  }
    12.5  
    12.6  dnl Check for SDL
    12.7 -SDL_VERSION=1.2.10
    12.8 +SDL_VERSION=2.0.0
    12.9  AM_PATH_SDL($SDL_VERSION,
   12.10              :,
   12.11              AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
   12.12 @@ -686,7 +686,7 @@
   12.13  AC_OUTPUT([
   12.14  ])
   12.15  AC_CONFIG_FILES([
   12.16 -    Makefile SDL_mixer.spec SDL_mixer.qpg SDL_mixer.pc
   12.17 +    Makefile SDL2_mixer.spec SDL2_mixer.pc
   12.18  ])
   12.19  AC_CONFIG_COMMANDS([default],
   12.20                     [cat >>Makefile <<__EOF__