diff options
| -rw-r--r-- | packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-image-1.2.3/autotools.patch | 805 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-image_1.2.3.bb | 12 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-net-1.2.7/libtool2.patch | 13 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-net_1.2.7.bb | 11 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-ttf_2.0.3.bb | 5 |
7 files changed, 835 insertions, 11 deletions
diff --git a/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty diff --git a/packages/libsdl/libsdl-image-1.2.3/autotools.patch b/packages/libsdl/libsdl-image-1.2.3/autotools.patch new file mode 100644 index 0000000000..c93a1dd9c3 --- /dev/null +++ b/packages/libsdl/libsdl-image-1.2.3/autotools.patch @@ -0,0 +1,805 @@ +Index: SDL_image-1.2.3/acinclude.m4 +=================================================================== +--- SDL_image-1.2.3.orig/acinclude.m4 2001-11-02 21:39:10.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,608 +0,0 @@ +-# Configure paths for SDL +-# Sam Lantinga 9/21/99 +-# stolen from Manish Singh +-# stolen back from Frank Belew +-# stolen from Manish Singh +-# Shamelessly stolen from Owen Taylor +- +-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +-dnl +-AC_DEFUN(AM_PATH_SDL, +-[dnl +-dnl Get the cflags and libraries from the sdl-config script +-dnl +-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], +- sdl_prefix="$withval", sdl_prefix="") +-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], +- sdl_exec_prefix="$withval", sdl_exec_prefix="") +-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], +- , enable_sdltest=yes) +- +- if test x$sdl_exec_prefix != x ; then +- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config +- fi +- fi +- if test x$sdl_prefix != x ; then +- sdl_args="$sdl_args --prefix=$sdl_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_prefix/bin/sdl-config +- fi +- fi +- +- AC_REQUIRE([AC_CANONICAL_TARGET]) +- AC_PATH_PROG(SDL_CONFIG, sdl-config, no) +- min_sdl_version=ifelse([$1], ,0.11.0,$1) +- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) +- no_sdl="" +- if test "$SDL_CONFIG" = "no" ; then +- no_sdl=yes +- else +- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` +- +- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_sdltest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +-dnl +-dnl Now check if the installed SDL is sufficiently new. (Also sanity +-dnl checks the results of sdl-config to some extent +-dnl +- rm -f conf.sdltest +- AC_TRY_RUN([ +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include "SDL.h" +- +-char* +-my_strdup (char *str) +-{ +- char *new_str; +- +- if (str) +- { +- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); +- strcpy (new_str, str); +- } +- else +- new_str = NULL; +- +- return new_str; +-} +- +-int main (int argc, char *argv[]) +-{ +- int major, minor, micro; +- char *tmp_version; +- +- /* This hangs on some systems (?) +- system ("touch conf.sdltest"); +- */ +- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = my_strdup("$min_sdl_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_sdl_version"); +- exit(1); +- } +- +- if (($sdl_major_version > major) || +- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || +- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); +- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); +- printf("*** best to upgrade to the required version.\n"); +- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); +- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); +- printf("*** config.cache before re-running configure\n"); +- return 1; +- } +-} +- +-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_sdl" = x ; then +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$SDL_CONFIG" = "no" ; then +- echo "*** The sdl-config script installed by SDL could not be found" +- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the SDL_CONFIG environment variable to the" +- echo "*** full path to sdl-config." +- else +- if test -f conf.sdltest ; then +- : +- else +- echo "*** Could not run SDL test program, checking why..." +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +- AC_TRY_LINK([ +-#include <stdio.h> +-#include "SDL.h" +- +-int main(int argc, char *argv[]) +-{ return 0; } +-#undef main +-#define main K_and_R_C_main +-], [ return 0; ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding SDL or finding the wrong" +- echo "*** version of SDL. If it is not finding SDL, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means SDL was incorrectly installed" +- echo "*** or that you have moved SDL since it was installed. In the latter case, you" +- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- SDL_CFLAGS="" +- SDL_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(SDL_CFLAGS) +- AC_SUBST(SDL_LIBS) +- rm -f conf.sdltest +-]) +-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- +-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc. +-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +-## +-## This program is free software; you can redistribute it and/or modify +-## it under the terms of the GNU General Public License as published by +-## the Free Software Foundation; either version 2 of the License, or +-## (at your option) any later version. +-## +-## This program is distributed in the hope that it will be useful, but +-## WITHOUT ANY WARRANTY; without even the implied warranty of +-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-## General Public License for more details. +-## +-## You should have received a copy of the GNU General Public License +-## along with this program; if not, write to the Free Software +-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-## +-## As a special exception to the GNU General Public License, if you +-## distribute this file as part of a program that contains a +-## configuration script generated by Autoconf, you may include it under +-## the same distribution terms that you use for the rest of that program. +- +-# serial 40 AC_PROG_LIBTOOL +-AC_DEFUN(AC_PROG_LIBTOOL, +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +- +-# Save cache, so that ltconfig can load it +-AC_CACHE_SAVE +- +-# Actually configure libtool. ac_aux_dir is where install-sh is found. +-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ +-|| AC_MSG_ERROR([libtool configure failed]) +- +-# Reload cache, that may have been modified by ltconfig +-AC_CACHE_LOAD +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Redirect the config.log output again, so that the ltconfig log is not +-# clobbered by the next message. +-exec 5>>./config.log +-]) +- +-AC_DEFUN(AC_LIBTOOL_SETUP, +-[AC_PREREQ(2.13)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_RANLIB])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +-AC_REQUIRE([AC_PROG_LN_S])dnl +-dnl +- +-case "$target" in +-NONE) lt_target="$host" ;; +-*) lt_target="$target" ;; +-esac +- +-# Check for any special flags to pass to ltconfig. +-libtool_flags="--cache-file=$cache_file" +-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" +-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], +-[libtool_flags="$libtool_flags --enable-dlopen"]) +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[libtool_flags="$libtool_flags --enable-win32-dll"]) +-AC_ARG_ENABLE(libtool-lock, +- [ --disable-libtool-lock avoid locking (might break parallel builds)]) +-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case "$lt_target" in +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +- +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +-]) +-esac +-]) +- +-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support +-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +- +-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's +-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +- +-# AC_ENABLE_SHARED - implement the --enable-shared flag +-# Usage: AC_ENABLE_SHARED[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_SHARED, [dnl +-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(shared, +-changequote(<<, >>)dnl +-<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_shared=yes ;; +-no) enable_shared=no ;; +-*) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl +-]) +- +-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared +-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no)]) +- +-# AC_ENABLE_STATIC - implement the --enable-static flag +-# Usage: AC_ENABLE_STATIC[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_STATIC, [dnl +-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(static, +-changequote(<<, >>)dnl +-<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_static=yes ;; +-no) enable_static=no ;; +-*) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl +-]) +- +-# AC_DISABLE_STATIC - set the default static flag to --disable-static +-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no)]) +- +- +-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag +-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(fast-install, +-changequote(<<, >>)dnl +-<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_fast_install=yes ;; +-no) enable_fast_install=no ;; +-*) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl +-]) +- +-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install +-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no)]) +- +-# AC_PROG_LD - find the path to the GNU or non-GNU linker +-AC_DEFUN(AC_PROG_LD, +-[AC_ARG_WITH(gnu-ld, +-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], +-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$ac_cv_prog_gcc" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by GCC]) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` +- case "$ac_prog" in +- # Accept absolute paths. +-changequote(,)dnl +- [\\/]* | [A-Za-z]:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +-changequote([,])dnl +- # Canonicalize the path of ld +- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(ac_cv_path_LD, +-[if test -z "$LD"; then +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- ac_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then +- test "$with_gnu_ld" != no && break +- else +- test "$with_gnu_ld" != yes && break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-else +- ac_cv_path_LD="$LD" # Let the user override the test with a path. +-fi]) +-LD="$ac_cv_path_LD" +-if test -n "$LD"; then +- AC_MSG_RESULT($LD) +-else +- AC_MSG_RESULT(no) +-fi +-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-AC_PROG_LD_GNU +-]) +- +-AC_DEFUN(AC_PROG_LD_GNU, +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, +-[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then +- ac_cv_prog_gnu_ld=yes +-else +- ac_cv_prog_gnu_ld=no +-fi]) +-]) +- +-# AC_PROG_NM - find the path to a BSD-compatible name lister +-AC_DEFUN(AC_PROG_NM, +-[AC_MSG_CHECKING([for BSD-compatible nm]) +-AC_CACHE_VAL(ac_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- ac_cv_path_NM="$NM" +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -B" +- break +- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -p" +- break +- else +- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm +-fi]) +-NM="$ac_cv_path_NM" +-AC_MSG_RESULT([$NM]) +-]) +- +-# AC_CHECK_LIBM - check for math library +-AC_DEFUN(AC_CHECK_LIBM, +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case "$lt_target" in +-*-*-beos* | *-*-cygwin*) +- # These system don't have libm +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, main, LIBM="-lm") +- ;; +-esac +-]) +- +-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl convenience library and INCLTDL to the include flags for +-# the libltdl header and adds --enable-ltdl-convenience to the +-# configure arguments. Note that LIBLTDL and INCLTDL are not +-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not +-# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed +-# with '${top_builddir}/' and INCLTDL will be prefixed with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. +-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case "$enable_ltdl_convenience" in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +-]) +- +-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl installable library and INCLTDL to the include flags for +-# the libltdl header and adds --enable-ltdl-install to the configure +-# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +-# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed +-# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will +-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +-# with '${top_srcdir}/' (note the single quotes!). If your package is +-# not flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, main, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- INCLTDL= +- fi +-]) +- +-dnl old names +-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl +-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl +-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl +- +-dnl This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL])dnl +Index: SDL_image-1.2.3/m4/sdl.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ SDL_image-1.2.3/m4/sdl.m4 2008-07-24 01:32:20.220875043 +0200 +@@ -0,0 +1,174 @@ ++# Configure paths for SDL ++# Sam Lantinga 9/21/99 ++# stolen from Manish Singh ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS ++dnl ++AC_DEFUN(AM_PATH_SDL, ++[dnl ++dnl Get the cflags and libraries from the sdl-config script ++dnl ++AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], ++ sdl_prefix="$withval", sdl_prefix="") ++AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], ++ sdl_exec_prefix="$withval", sdl_exec_prefix="") ++AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], ++ , enable_sdltest=yes) ++ ++ if test x$sdl_exec_prefix != x ; then ++ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config ++ fi ++ fi ++ if test x$sdl_prefix != x ; then ++ sdl_args="$sdl_args --prefix=$sdl_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_prefix/bin/sdl-config ++ fi ++ fi ++ ++ AC_REQUIRE([AC_CANONICAL_TARGET]) ++ AC_PATH_PROG(SDL_CONFIG, sdl-config, no) ++ min_sdl_version=ifelse([$1], ,0.11.0,$1) ++ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) ++ no_sdl="" ++ if test "$SDL_CONFIG" = "no" ; then ++ no_sdl=yes ++ else ++ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` ++ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` ++ ++ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_sdltest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++dnl ++dnl Now check if the installed SDL is sufficiently new. (Also sanity ++dnl checks the results of sdl-config to some extent ++dnl ++ rm -f conf.sdltest ++ AC_TRY_RUN([ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "SDL.h" ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main (int argc, char *argv[]) ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ /* This hangs on some systems (?) ++ system ("touch conf.sdltest"); ++ */ ++ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_sdl_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_sdl_version"); ++ exit(1); ++ } ++ ++ if (($sdl_major_version > major) || ++ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || ++ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); ++ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); ++ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_sdl" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$SDL_CONFIG" = "no" ; then ++ echo "*** The sdl-config script installed by SDL could not be found" ++ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the SDL_CONFIG environment variable to the" ++ echo "*** full path to sdl-config." ++ else ++ if test -f conf.sdltest ; then ++ : ++ else ++ echo "*** Could not run SDL test program, checking why..." ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++ AC_TRY_LINK([ ++#include <stdio.h> ++#include "SDL.h" ++ ++int main(int argc, char *argv[]) ++{ return 0; } ++#undef main ++#define main K_and_R_C_main ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding SDL or finding the wrong" ++ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means SDL was incorrectly installed" ++ echo "*** or that you have moved SDL since it was installed. In the latter case, you" ++ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ SDL_CFLAGS="" ++ SDL_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(SDL_CFLAGS) ++ AC_SUBST(SDL_LIBS) ++ rm -f conf.sdltest ++]) +Index: SDL_image-1.2.3/configure.in +=================================================================== +--- SDL_image-1.2.3.orig/configure.in 2008-07-24 01:34:07.807534207 +0200 ++++ SDL_image-1.2.3/configure.in 2008-07-24 01:34:16.960864590 +0200 +@@ -44,6 +44,8 @@ + AM_INIT_AUTOMAKE(SDL_image, $VERSION) + AM_MAINTAINER_MODE + ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl Check for tools + + AC_LIBTOOL_WIN32_DLL diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb index b35aa3bf1e..1a911f9f62 100644 --- a/packages/libsdl/libsdl-image_1.2.3.bb +++ b/packages/libsdl/libsdl-image_1.2.3.bb @@ -3,15 +3,19 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "zlib libpng jpeg virtual/libsdl" LICENSE = "LGPL" +PR = "r1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://autotools.patch;patch=1 \ + " -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz" S = "${WORKDIR}/SDL_image-${PV}" +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + inherit autotools do_stage() { - oe_libinstall -so libSDL_image ${STAGING_LIBDIR} - ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so - install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h + autotools_stage_all } diff --git a/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty diff --git a/packages/libsdl/libsdl-net-1.2.7/libtool2.patch b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch new file mode 100644 index 0000000000..ea6daf7d48 --- /dev/null +++ b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch @@ -0,0 +1,13 @@ +Index: SDL_net-1.2.7/configure.in +=================================================================== +--- SDL_net-1.2.7.orig/configure.in 2007-07-20 14:40:02.000000000 +0200 ++++ SDL_net-1.2.7/configure.in 2008-07-24 00:41:04.282718579 +0200 +@@ -42,6 +42,8 @@ + dnl Setup for automake + AM_INIT_AUTOMAKE(SDL_net, $VERSION) + ++dnl got macros ++AC_CONFIG_MACRO_DIR([acinclude]) + dnl Check for tools + + AC_LIBTOOL_WIN32_DLL diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb index 8149cce379..8cbea5bd01 100644 --- a/packages/libsdl/libsdl-net_1.2.7.bb +++ b/packages/libsdl/libsdl-net_1.2.7.bb @@ -3,16 +3,19 @@ SECTION = "libs/network" PRIORITY = "optional" DEPENDS = "virtual/libsdl" LICENSE = "LGPL" +PR = "r1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \ + file://libtool2.patch;patch=1 \ + " -SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz" S = "${WORKDIR}/SDL_net-${PV}" inherit autotools + EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config" do_stage() { - oe_libinstall -so libSDL_net ${STAGING_LIBDIR} - ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so - install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h + autotools_stage_all } diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb index 59e9174fac..250fb698ce 100644 --- a/packages/libsdl/libsdl-ttf_2.0.3.bb +++ b/packages/libsdl/libsdl-ttf_2.0.3.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libsdl freetype" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ file://new-freetype-includes.patch;patch=1" @@ -11,7 +12,5 @@ S = "${WORKDIR}/SDL_ttf-${PV}" inherit autotools do_stage() { - oe_libinstall -so libSDL_ttf ${STAGING_LIBDIR} - ln -sf libSDL_ttf.so ${STAGING_LIBDIR}/libSDL_ttf-2.0.so - install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h + autotools_stage_all } |