Switched from SDL_image to SDL2_image
authorSam Lantinga <slouken@libsdl.org>
Sun, 22 Jan 2012 23:20:50 -0500
changeset 321fd488b9e71e0
parent 320 aa5d55b11751
child 322 92e073f230d0
Switched from SDL_image to SDL2_image
Makefile.am
Makefile.in
SDL2_image.pc.in
SDL2_image.spec.in
SDL_image.pc.in
SDL_image.spec.in
aclocal.m4
configure
configure.in
     1.1 --- a/Makefile.am	Sun Jan 22 21:52:00 2012 -0500
     1.2 +++ b/Makefile.am	Sun Jan 22 23:20:50 2012 -0500
     1.3 @@ -1,16 +1,16 @@
     1.4  # Makefile.am for the SDL sample image loading library and viewer
     1.5  
     1.6 -lib_LTLIBRARIES = libSDL_image.la
     1.7 +lib_LTLIBRARIES = libSDL2_image.la
     1.8  
     1.9 -libSDL_imageincludedir = $(includedir)/SDL
    1.10 -libSDL_imageinclude_HEADERS =	\
    1.11 +libSDL2_imageincludedir = $(includedir)/SDL2
    1.12 +libSDL2_imageinclude_HEADERS =	\
    1.13  	SDL_image.h
    1.14  
    1.15  if USE_IMAGEIO
    1.16  IMAGEIO_SOURCE = IMG_ImageIO.m
    1.17  endif
    1.18  
    1.19 -libSDL_image_la_SOURCES =	\
    1.20 +libSDL2_image_la_SOURCES =	\
    1.21  	IMG.c			\
    1.22  	IMG_bmp.c		\
    1.23  	IMG_gif.c		\
    1.24 @@ -37,34 +37,34 @@
    1.25  	Xcode-iOS		\
    1.26  	IMG_xxx.c		\
    1.27  	IMG_UIImage.m		\
    1.28 -	SDL_image.spec		\
    1.29 +	SDL2_image.spec		\
    1.30  	gcc-fat.sh		\
    1.31  	autogen.sh
    1.32  
    1.33  if USE_VERSION_RC
    1.34 -libSDL_image_la_LDFLAGS = 	\
    1.35 +libSDL2_image_la_LDFLAGS = 	\
    1.36  	-no-undefined		\
    1.37  	-release $(LT_RELEASE)	\
    1.38  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o
    1.39 -libSDL_image_la_LIBADD = $(IMG_LIBS)
    1.40 -libSDL_image_la_DEPENDENCIES = version.o
    1.41 +libSDL2_image_la_LIBADD = $(IMG_LIBS)
    1.42 +libSDL2_image_la_DEPENDENCIES = version.o
    1.43  else
    1.44 -libSDL_image_la_LDFLAGS = 	\
    1.45 +libSDL2_image_la_LDFLAGS = 	\
    1.46  	-no-undefined		\
    1.47  	-release $(LT_RELEASE)	\
    1.48  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    1.49 -libSDL_image_la_LIBADD = $(IMG_LIBS)
    1.50 +libSDL2_image_la_LIBADD = $(IMG_LIBS)
    1.51  endif
    1.52  
    1.53  pkgconfigdir = $(libdir)/pkgconfig
    1.54 -pkgconfig_DATA = SDL_image.pc
    1.55 +pkgconfig_DATA = SDL2_image.pc
    1.56  
    1.57  %.o : %.rc
    1.58  	$(WINDRES) $< $@
    1.59  
    1.60  noinst_PROGRAMS = showimage
    1.61  
    1.62 -showimage_LDADD = libSDL_image.la
    1.63 +showimage_LDADD = libSDL2_image.la
    1.64  
    1.65  # Rule to build tar-gzipped distribution package
    1.66  $(PACKAGE)-$(VERSION).tar.gz: distcheck
     2.1 --- a/Makefile.in	Sun Jan 22 21:52:00 2012 -0500
     2.2 +++ b/Makefile.in	Sun Jan 22 23:20:50 2012 -0500
     2.3 @@ -37,14 +37,14 @@
     2.4  POST_UNINSTALL = :
     2.5  build_triplet = @build@
     2.6  host_triplet = @host@
     2.7 -@USE_VERSION_RC_FALSE@libSDL_image_la_DEPENDENCIES =  \
     2.8 +@USE_VERSION_RC_FALSE@libSDL2_image_la_DEPENDENCIES =  \
     2.9  @USE_VERSION_RC_FALSE@	$(am__DEPENDENCIES_1)
    2.10  noinst_PROGRAMS = showimage$(EXEEXT)
    2.11  subdir = .
    2.12  DIST_COMMON = README $(am__configure_deps) \
    2.13 -	$(libSDL_imageinclude_HEADERS) $(srcdir)/Makefile.am \
    2.14 -	$(srcdir)/Makefile.in $(srcdir)/SDL_image.pc.in \
    2.15 -	$(srcdir)/SDL_image.spec.in $(top_srcdir)/configure COPYING \
    2.16 +	$(libSDL2_imageinclude_HEADERS) $(srcdir)/Makefile.am \
    2.17 +	$(srcdir)/Makefile.in $(srcdir)/SDL2_image.pc.in \
    2.18 +	$(srcdir)/SDL2_image.spec.in $(top_srcdir)/configure COPYING \
    2.19  	config.guess config.sub depcomp install-sh ltmain.sh missing
    2.20  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    2.21  am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \
    2.22 @@ -59,7 +59,7 @@
    2.23  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    2.24   configure.lineno config.status.lineno
    2.25  mkinstalldirs = $(install_sh) -d
    2.26 -CONFIG_CLEAN_FILES = SDL_image.spec SDL_image.pc
    2.27 +CONFIG_CLEAN_FILES = SDL2_image.spec SDL2_image.pc
    2.28  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    2.29  am__vpath_adj = case $$p in \
    2.30      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    2.31 @@ -67,26 +67,27 @@
    2.32    esac;
    2.33  am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    2.34  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
    2.35 -	"$(DESTDIR)$(libSDL_imageincludedir)"
    2.36 +	"$(DESTDIR)$(libSDL2_imageincludedir)"
    2.37  libLTLIBRARIES_INSTALL = $(INSTALL)
    2.38  LTLIBRARIES = $(lib_LTLIBRARIES)
    2.39  am__DEPENDENCIES_1 =
    2.40 -am__libSDL_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c IMG_jpg.c \
    2.41 -	IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c IMG_tif.c \
    2.42 -	IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c IMG_ImageIO.m
    2.43 +am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c \
    2.44 +	IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c \
    2.45 +	IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c \
    2.46 +	IMG_ImageIO.m
    2.47  @USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo
    2.48 -am_libSDL_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \
    2.49 +am_libSDL2_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \
    2.50  	IMG_lbm.lo IMG_pcx.lo IMG_png.lo IMG_pnm.lo IMG_tga.lo \
    2.51  	IMG_tif.lo IMG_xcf.lo IMG_xpm.lo IMG_xv.lo IMG_webp.lo \
    2.52  	$(am__objects_1)
    2.53 -libSDL_image_la_OBJECTS = $(am_libSDL_image_la_OBJECTS)
    2.54 -libSDL_image_la_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
    2.55 +libSDL2_image_la_OBJECTS = $(am_libSDL2_image_la_OBJECTS)
    2.56 +libSDL2_image_la_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
    2.57  	--mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
    2.58 -	$(libSDL_image_la_LDFLAGS) $(LDFLAGS) -o $@
    2.59 +	$(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
    2.60  PROGRAMS = $(noinst_PROGRAMS)
    2.61  showimage_SOURCES = showimage.c
    2.62  showimage_OBJECTS = showimage.$(OBJEXT)
    2.63 -showimage_DEPENDENCIES = libSDL_image.la
    2.64 +showimage_DEPENDENCIES = libSDL2_image.la
    2.65  DEFAULT_INCLUDES = -I.@am__isrc@
    2.66  depcomp = $(SHELL) $(top_srcdir)/depcomp
    2.67  am__depfiles_maybe = depfiles
    2.68 @@ -108,12 +109,12 @@
    2.69  OBJCLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
    2.70  	$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) \
    2.71  	$(LDFLAGS) -o $@
    2.72 -SOURCES = $(libSDL_image_la_SOURCES) showimage.c
    2.73 -DIST_SOURCES = $(am__libSDL_image_la_SOURCES_DIST) showimage.c
    2.74 +SOURCES = $(libSDL2_image_la_SOURCES) showimage.c
    2.75 +DIST_SOURCES = $(am__libSDL2_image_la_SOURCES_DIST) showimage.c
    2.76  pkgconfigDATA_INSTALL = $(INSTALL_DATA)
    2.77  DATA = $(pkgconfig_DATA)
    2.78 -libSDL_imageincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    2.79 -HEADERS = $(libSDL_imageinclude_HEADERS)
    2.80 +libSDL2_imageincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    2.81 +HEADERS = $(libSDL2_imageinclude_HEADERS)
    2.82  ETAGS = etags
    2.83  CTAGS = ctags
    2.84  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    2.85 @@ -262,13 +263,13 @@
    2.86  target_alias = @target_alias@
    2.87  top_builddir = @top_builddir@
    2.88  top_srcdir = @top_srcdir@
    2.89 -lib_LTLIBRARIES = libSDL_image.la
    2.90 -libSDL_imageincludedir = $(includedir)/SDL
    2.91 -libSDL_imageinclude_HEADERS = \
    2.92 +lib_LTLIBRARIES = libSDL2_image.la
    2.93 +libSDL2_imageincludedir = $(includedir)/SDL2
    2.94 +libSDL2_imageinclude_HEADERS = \
    2.95  	SDL_image.h
    2.96  
    2.97  @USE_IMAGEIO_TRUE@IMAGEIO_SOURCE = IMG_ImageIO.m
    2.98 -libSDL_image_la_SOURCES = \
    2.99 +libSDL2_image_la_SOURCES = \
   2.100  	IMG.c			\
   2.101  	IMG_bmp.c		\
   2.102  	IMG_gif.c		\
   2.103 @@ -295,26 +296,26 @@
   2.104  	Xcode-iOS		\
   2.105  	IMG_xxx.c		\
   2.106  	IMG_UIImage.m		\
   2.107 -	SDL_image.spec		\
   2.108 +	SDL2_image.spec		\
   2.109  	gcc-fat.sh		\
   2.110  	autogen.sh
   2.111  
   2.112 -@USE_VERSION_RC_FALSE@libSDL_image_la_LDFLAGS = \
   2.113 +@USE_VERSION_RC_FALSE@libSDL2_image_la_LDFLAGS = \
   2.114  @USE_VERSION_RC_FALSE@	-no-undefined		\
   2.115  @USE_VERSION_RC_FALSE@	-release $(LT_RELEASE)	\
   2.116  @USE_VERSION_RC_FALSE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
   2.117  
   2.118 -@USE_VERSION_RC_TRUE@libSDL_image_la_LDFLAGS = \
   2.119 +@USE_VERSION_RC_TRUE@libSDL2_image_la_LDFLAGS = \
   2.120  @USE_VERSION_RC_TRUE@	-no-undefined		\
   2.121  @USE_VERSION_RC_TRUE@	-release $(LT_RELEASE)	\
   2.122  @USE_VERSION_RC_TRUE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o
   2.123  
   2.124 -@USE_VERSION_RC_FALSE@libSDL_image_la_LIBADD = $(IMG_LIBS)
   2.125 -@USE_VERSION_RC_TRUE@libSDL_image_la_LIBADD = $(IMG_LIBS)
   2.126 -@USE_VERSION_RC_TRUE@libSDL_image_la_DEPENDENCIES = version.o
   2.127 +@USE_VERSION_RC_FALSE@libSDL2_image_la_LIBADD = $(IMG_LIBS)
   2.128 +@USE_VERSION_RC_TRUE@libSDL2_image_la_LIBADD = $(IMG_LIBS)
   2.129 +@USE_VERSION_RC_TRUE@libSDL2_image_la_DEPENDENCIES = version.o
   2.130  pkgconfigdir = $(libdir)/pkgconfig
   2.131 -pkgconfig_DATA = SDL_image.pc
   2.132 -showimage_LDADD = libSDL_image.la
   2.133 +pkgconfig_DATA = SDL2_image.pc
   2.134 +showimage_LDADD = libSDL2_image.la
   2.135  all: all-am
   2.136  
   2.137  .SUFFIXES:
   2.138 @@ -352,9 +353,9 @@
   2.139  	cd $(srcdir) && $(AUTOCONF)
   2.140  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   2.141  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   2.142 -SDL_image.spec: $(top_builddir)/config.status $(srcdir)/SDL_image.spec.in
   2.143 +SDL2_image.spec: $(top_builddir)/config.status $(srcdir)/SDL2_image.spec.in
   2.144  	cd $(top_builddir) && $(SHELL) ./config.status $@
   2.145 -SDL_image.pc: $(top_builddir)/config.status $(srcdir)/SDL_image.pc.in
   2.146 +SDL2_image.pc: $(top_builddir)/config.status $(srcdir)/SDL2_image.pc.in
   2.147  	cd $(top_builddir) && $(SHELL) ./config.status $@
   2.148  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
   2.149  	@$(NORMAL_INSTALL)
   2.150 @@ -383,8 +384,8 @@
   2.151  	  echo "rm -f \"$${dir}/so_locations\""; \
   2.152  	  rm -f "$${dir}/so_locations"; \
   2.153  	done
   2.154 -libSDL_image.la: $(libSDL_image_la_OBJECTS) $(libSDL_image_la_DEPENDENCIES) 
   2.155 -	$(libSDL_image_la_LINK) -rpath $(libdir) $(libSDL_image_la_OBJECTS) $(libSDL_image_la_LIBADD) $(LIBS)
   2.156 +libSDL2_image.la: $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_DEPENDENCIES) 
   2.157 +	$(libSDL2_image_la_LINK) -rpath $(libdir) $(libSDL2_image_la_OBJECTS) $(libSDL2_image_la_LIBADD) $(LIBS)
   2.158  
   2.159  clean-noinstPROGRAMS:
   2.160  	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
   2.161 @@ -486,22 +487,22 @@
   2.162  	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
   2.163  	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
   2.164  	done
   2.165 -install-libSDL_imageincludeHEADERS: $(libSDL_imageinclude_HEADERS)
   2.166 +install-libSDL2_imageincludeHEADERS: $(libSDL2_imageinclude_HEADERS)
   2.167  	@$(NORMAL_INSTALL)
   2.168 -	test -z "$(libSDL_imageincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libSDL_imageincludedir)"
   2.169 -	@list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \
   2.170 +	test -z "$(libSDL2_imageincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libSDL2_imageincludedir)"
   2.171 +	@list='$(libSDL2_imageinclude_HEADERS)'; for p in $$list; do \
   2.172  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
   2.173  	  f=$(am__strip_dir) \
   2.174 -	  echo " $(libSDL_imageincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \
   2.175 -	  $(libSDL_imageincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \
   2.176 +	  echo " $(libSDL2_imageincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDL2_imageincludedir)/$$f'"; \
   2.177 +	  $(libSDL2_imageincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDL2_imageincludedir)/$$f"; \
   2.178  	done
   2.179  
   2.180 -uninstall-libSDL_imageincludeHEADERS:
   2.181 +uninstall-libSDL2_imageincludeHEADERS:
   2.182  	@$(NORMAL_UNINSTALL)
   2.183 -	@list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \
   2.184 +	@list='$(libSDL2_imageinclude_HEADERS)'; for p in $$list; do \
   2.185  	  f=$(am__strip_dir) \
   2.186 -	  echo " rm -f '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \
   2.187 -	  rm -f "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \
   2.188 +	  echo " rm -f '$(DESTDIR)$(libSDL2_imageincludedir)/$$f'"; \
   2.189 +	  rm -f "$(DESTDIR)$(libSDL2_imageincludedir)/$$f"; \
   2.190  	done
   2.191  
   2.192  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   2.193 @@ -580,7 +581,7 @@
   2.194  	    || exit 1; \
   2.195  	  fi; \
   2.196  	done
   2.197 -	-find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o \
   2.198 +	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
   2.199  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
   2.200  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
   2.201  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
   2.202 @@ -681,7 +682,7 @@
   2.203  check: check-am
   2.204  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
   2.205  installdirs:
   2.206 -	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL_imageincludedir)"; do \
   2.207 +	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libSDL2_imageincludedir)"; do \
   2.208  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
   2.209  	done
   2.210  install: install-am
   2.211 @@ -730,7 +731,7 @@
   2.212  
   2.213  info-am:
   2.214  
   2.215 -install-data-am: install-libSDL_imageincludeHEADERS \
   2.216 +install-data-am: install-libSDL2_imageincludeHEADERS \
   2.217  	install-pkgconfigDATA
   2.218  
   2.219  install-dvi: install-dvi-am
   2.220 @@ -770,7 +771,7 @@
   2.221  ps-am:
   2.222  
   2.223  uninstall-am: uninstall-libLTLIBRARIES \
   2.224 -	uninstall-libSDL_imageincludeHEADERS uninstall-pkgconfigDATA
   2.225 +	uninstall-libSDL2_imageincludeHEADERS uninstall-pkgconfigDATA
   2.226  
   2.227  .MAKE: install-am install-strip
   2.228  
   2.229 @@ -784,13 +785,13 @@
   2.230  	install-data install-data-am install-dvi install-dvi-am \
   2.231  	install-exec install-exec-am install-html install-html-am \
   2.232  	install-info install-info-am install-libLTLIBRARIES \
   2.233 -	install-libSDL_imageincludeHEADERS install-man install-pdf \
   2.234 +	install-libSDL2_imageincludeHEADERS install-man install-pdf \
   2.235  	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
   2.236  	install-strip installcheck installcheck-am installdirs \
   2.237  	maintainer-clean maintainer-clean-generic mostlyclean \
   2.238  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
   2.239  	pdf pdf-am ps ps-am tags uninstall uninstall-am \
   2.240 -	uninstall-libLTLIBRARIES uninstall-libSDL_imageincludeHEADERS \
   2.241 +	uninstall-libLTLIBRARIES uninstall-libSDL2_imageincludeHEADERS \
   2.242  	uninstall-pkgconfigDATA
   2.243  
   2.244  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/SDL2_image.pc.in	Sun Jan 22 23:20:50 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: @PACKAGE@
    3.10 +Description: image loading library for Simple DirectMedia Layer
    3.11 +Version: @VERSION@
    3.12 +Requires: sdl2 >= @SDL_VERSION@
    3.13 +Libs: -L${libdir} -lSDL2_image
    3.14 +Cflags: -I${includedir}/SDL
    3.15 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/SDL2_image.spec.in	Sun Jan 22 23:20:50 2012 -0500
     4.3 @@ -0,0 +1,69 @@
     4.4 +%define name @PACKAGE@
     4.5 +%define version @VERSION@
     4.6 +%define release 1
     4.7 +
     4.8 +Summary: Simple DirectMedia Layer - Sample Image Loading 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 +Packager: Hakan Tandogan <hakan@iconsult.com>
    4.18 +#BuildRequires: SDL2-devel
    4.19 +#BuildRequires: libjpeg-devel
    4.20 +#BuildRequires: libpng-devel
    4.21 +#BuildRequires: libtiff-devel
    4.22 +
    4.23 +%description
    4.24 +This is a simple library to load images of various formats as SDL surfaces.
    4.25 +This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
    4.26 +
    4.27 +%package devel
    4.28 +Summary: Libraries, includes and more to develop SDL applications.
    4.29 +Group: Development/Libraries
    4.30 +Requires: %{name}
    4.31 +Requires: SDL2-devel
    4.32 +
    4.33 +%description devel
    4.34 +This is a simple library to load images of various formats as SDL surfaces.
    4.35 +This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
    4.36 +
    4.37 +%prep
    4.38 +rm -rf ${RPM_BUILD_ROOT}
    4.39 +
    4.40 +%setup 
    4.41 +
    4.42 +%build
    4.43 +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
    4.44 +make
    4.45 +
    4.46 +%install
    4.47 +rm -rf $RPM_BUILD_ROOT
    4.48 +make install prefix=$RPM_BUILD_ROOT/%{prefix}
    4.49 +
    4.50 +%clean
    4.51 +rm -rf $RPM_BUILD_ROOT
    4.52 +
    4.53 +%files
    4.54 +%defattr(-,root,root)
    4.55 +%doc README CHANGES COPYING
    4.56 +%{prefix}/lib/lib*.so.*
    4.57 +
    4.58 +%files devel
    4.59 +%defattr(-,root,root)
    4.60 +%{prefix}/lib/lib*.a
    4.61 +%{prefix}/lib/lib*.la
    4.62 +%{prefix}/lib/lib*.so
    4.63 +%{prefix}/include/SDL/
    4.64 +%{prefix}/lib/pkgconfig/*.pc
    4.65 +
    4.66 +%changelog
    4.67 +* Wed Jan 19 2000 Sam Lantinga 
    4.68 +- converted to get package information from configure
    4.69 +* Tue Jan 18 2000 Hakan Tandogan <hakan@iconsult.com>
    4.70 +- initial spec file
    4.71 +
    4.72 +
     5.1 --- a/SDL_image.pc.in	Sun Jan 22 21:52:00 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_image
    5.10 -Description: image loading library for Simple DirectMedia Layer
    5.11 -Version: @VERSION@
    5.12 -Requires: sdl >= @SDL_VERSION@
    5.13 -Libs: -L${libdir} -lSDL_image
    5.14 -Cflags: -I${includedir}/SDL
    5.15 -
     6.1 --- a/SDL_image.spec.in	Sun Jan 22 21:52:00 2012 -0500
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,69 +0,0 @@
     6.4 -%define name @PACKAGE@
     6.5 -%define version @VERSION@
     6.6 -%define release 1
     6.7 -
     6.8 -Summary: Simple DirectMedia Layer - Sample Image Loading Library
     6.9 -Name: %{name}
    6.10 -Version: %{version}
    6.11 -Release: %{release}
    6.12 -Source0: %{name}-%{version}.tar.gz
    6.13 -License: LGPL
    6.14 -Group: System Environment/Libraries
    6.15 -BuildRoot: /var/tmp/%{name}-buildroot
    6.16 -Prefix: %{_prefix}
    6.17 -Packager: Hakan Tandogan <hakan@iconsult.com>
    6.18 -#BuildRequires: SDL-devel
    6.19 -#BuildRequires: libjpeg-devel
    6.20 -#BuildRequires: libpng-devel
    6.21 -#BuildRequires: libtiff-devel
    6.22 -
    6.23 -%description
    6.24 -This is a simple library to load images of various formats as SDL surfaces.
    6.25 -This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
    6.26 -
    6.27 -%package devel
    6.28 -Summary: Libraries, includes and more to develop SDL applications.
    6.29 -Group: Development/Libraries
    6.30 -Requires: %{name}
    6.31 -Requires: SDL-devel
    6.32 -
    6.33 -%description devel
    6.34 -This is a simple library to load images of various formats as SDL surfaces.
    6.35 -This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
    6.36 -
    6.37 -%prep
    6.38 -rm -rf ${RPM_BUILD_ROOT}
    6.39 -
    6.40 -%setup 
    6.41 -
    6.42 -%build
    6.43 -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
    6.44 -make
    6.45 -
    6.46 -%install
    6.47 -rm -rf $RPM_BUILD_ROOT
    6.48 -make install prefix=$RPM_BUILD_ROOT/%{prefix}
    6.49 -
    6.50 -%clean
    6.51 -rm -rf $RPM_BUILD_ROOT
    6.52 -
    6.53 -%files
    6.54 -%defattr(-,root,root)
    6.55 -%doc README CHANGES COPYING
    6.56 -%{prefix}/lib/lib*.so.*
    6.57 -
    6.58 -%files devel
    6.59 -%defattr(-,root,root)
    6.60 -%{prefix}/lib/lib*.a
    6.61 -%{prefix}/lib/lib*.la
    6.62 -%{prefix}/lib/lib*.so
    6.63 -%{prefix}/include/SDL/
    6.64 -%{prefix}/lib/pkgconfig/*.pc
    6.65 -
    6.66 -%changelog
    6.67 -* Wed Jan 19 2000 Sam Lantinga 
    6.68 -- converted to get package information from configure
    6.69 -* Tue Jan 18 2000 Hakan Tandogan <hakan@iconsult.com>
    6.70 -- initial spec file
    6.71 -
    6.72 -
     7.1 --- a/aclocal.m4	Sun Jan 22 21:52:00 2012 -0500
     7.2 +++ b/aclocal.m4	Sun Jan 22 23:20:50 2012 -0500
     7.3 @@ -16,105 +16,6 @@
     7.4  You have another version of autoconf.  If you want to use that,
     7.5  you should regenerate the build system entirely.], [63])])
     7.6  
     7.7 -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
     7.8 -#
     7.9 -#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
    7.10 -#   Written by Scott James Remnant, 2004.
    7.11 -#
    7.12 -# This file is free software; the Free Software Foundation gives
    7.13 -# unlimited permission to copy and/or distribute it, with or without
    7.14 -# modifications, as long as this notice is preserved.
    7.15 -
    7.16 -# serial 5 lt~obsolete.m4
    7.17 -
    7.18 -# These exist entirely to fool aclocal when bootstrapping libtool.
    7.19 -#
    7.20 -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
    7.21 -# which have later been changed to m4_define as they aren't part of the
    7.22 -# exported API, or moved to Autoconf or Automake where they belong.
    7.23 -#
    7.24 -# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
    7.25 -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
    7.26 -# using a macro with the same name in our local m4/libtool.m4 it'll
    7.27 -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
    7.28 -# and doesn't know about Autoconf macros at all.)
    7.29 -#
    7.30 -# So we provide this file, which has a silly filename so it's always
    7.31 -# included after everything else.  This provides aclocal with the
    7.32 -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
    7.33 -# because those macros already exist, or will be overwritten later.
    7.34 -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
    7.35 -#
    7.36 -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
    7.37 -# Yes, that means every name once taken will need to remain here until
    7.38 -# we give up compatibility with versions before 1.7, at which point
    7.39 -# we need to keep only those names which we still refer to.
    7.40 -
    7.41 -# This is to help aclocal find these macros, as it can't see m4_define.
    7.42 -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
    7.43 -
    7.44 -m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
    7.45 -m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
    7.46 -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
    7.47 -m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
    7.48 -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
    7.49 -m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
    7.50 -m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
    7.51 -m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
    7.52 -m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
    7.53 -m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
    7.54 -m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
    7.55 -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
    7.56 -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
    7.57 -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
    7.58 -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
    7.59 -m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
    7.60 -m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
    7.61 -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
    7.62 -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
    7.63 -m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
    7.64 -m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
    7.65 -m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
    7.66 -m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
    7.67 -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
    7.68 -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
    7.69 -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
    7.70 -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
    7.71 -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
    7.72 -m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
    7.73 -m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
    7.74 -m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
    7.75 -m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
    7.76 -m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
    7.77 -m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
    7.78 -m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
    7.79 -m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
    7.80 -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
    7.81 -m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
    7.82 -m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
    7.83 -m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
    7.84 -m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
    7.85 -m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
    7.86 -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
    7.87 -m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
    7.88 -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
    7.89 -m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
    7.90 -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
    7.91 -m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
    7.92 -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
    7.93 -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
    7.94 -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
    7.95 -m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
    7.96 -m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
    7.97 -m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
    7.98 -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
    7.99 -m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
   7.100 -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
   7.101 -m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
   7.102 -m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
   7.103 -m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
   7.104 -m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
   7.105 -
   7.106  # Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
   7.107  #
   7.108  # This file is free software; the Free Software Foundation
     8.1 --- a/configure	Sun Jan 22 21:52:00 2012 -0500
     8.2 +++ b/configure	Sun Jan 22 23:20:50 2012 -0500
     8.3 @@ -11102,7 +11102,7 @@
     8.4  
     8.5  
     8.6  # Define the identity of the package.
     8.7 - PACKAGE=SDL_image
     8.8 + PACKAGE=SDL2_image
     8.9   VERSION=$VERSION
    8.10  
    8.11  
    8.12 @@ -15014,7 +15014,7 @@
    8.13  OBJCFLAGS=$CFLAGS
    8.14  
    8.15  # Finally create all the generated files
    8.16 -ac_config_files="$ac_config_files Makefile SDL_image.spec SDL_image.pc"
    8.17 +ac_config_files="$ac_config_files Makefile SDL2_image.spec SDL2_image.pc"
    8.18  
    8.19  cat >confcache <<\_ACEOF
    8.20  # This file is a shell script that caches the results of configure
    8.21 @@ -15888,8 +15888,8 @@
    8.22      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    8.23      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    8.24      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    8.25 -    "SDL_image.spec") CONFIG_FILES="$CONFIG_FILES SDL_image.spec" ;;
    8.26 -    "SDL_image.pc") CONFIG_FILES="$CONFIG_FILES SDL_image.pc" ;;
    8.27 +    "SDL2_image.spec") CONFIG_FILES="$CONFIG_FILES SDL2_image.spec" ;;
    8.28 +    "SDL2_image.pc") CONFIG_FILES="$CONFIG_FILES SDL2_image.pc" ;;
    8.29  
    8.30    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    8.31  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     9.1 --- a/configure.in	Sun Jan 22 21:52:00 2012 -0500
     9.2 +++ b/configure.in	Sun Jan 22 23:20:50 2012 -0500
     9.3 @@ -42,7 +42,7 @@
     9.4  AC_CANONICAL_HOST
     9.5  
     9.6  dnl Setup for automake
     9.7 -AM_INIT_AUTOMAKE(SDL_image, $VERSION)
     9.8 +AM_INIT_AUTOMAKE(SDL2_image, $VERSION)
     9.9  
    9.10  dnl Check for tools
    9.11  AC_PROG_LIBTOOL
    9.12 @@ -377,6 +377,6 @@
    9.13  # Finally create all the generated files
    9.14  AC_OUTPUT([
    9.15  Makefile
    9.16 -SDL_image.spec
    9.17 -SDL_image.pc
    9.18 +SDL2_image.spec
    9.19 +SDL2_image.pc
    9.20  ])