diff --git a/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch b/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch deleted file mode 100644 --- a/media-libs/sdl-image/files/sdl-image-crosspkgconfig.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -c /mnt/satahd/portagetmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in -*** /configure.in 2007-07-21 01:26:26.000000000 -0400 ---- /var/tmp/portage/media-libs/sdl-image-1.2.6-r1/work/SDL_image-1.2.6/configure.in 2008-09-17 21:28:36.000000000 -0400 -*************** -*** 25,30 **** ---- 25,33 ---- - AC_SUBST(BINARY_AGE) - AC_SUBST(VERSION) - -+ #initialize pkgconfig -+ PKG_PROG_PKG_CONFIG -+ - # libtool versioning - LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION - LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE` -*************** -*** 79,89 **** - AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) - - dnl Check for SDL -! SDL_VERSION=1.2.10 -! AM_PATH_SDL($SDL_VERSION, -! :, -! AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) -! ) - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - saved_LIBS="$LIBS" ---- 82,91 ---- - AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) - - dnl Check for SDL -! dnl Versions newer than 1.2.11 have pkgconfig support. AND, it works better for cross-compiling. Thus, support for 1.2.10 is not in Binki's 's interest -! SDL_VERSION=1.2.11 -! -! PKG_CHECK_MODULES([SDL],[sdl >= 1.2.11]) - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - saved_LIBS="$LIBS" -*************** -*** 283,296 **** - fi - fi - -! LIBS="$saved_LIBS" - - AC_SUBST([WINDRES]) - AC_SUBST([IMG_LIBS]) - - # Finally create all the generated files - AC_OUTPUT([ - Makefile - SDL_image.spec - SDL_image.qpg - ]) ---- 285,300 ---- - fi - fi - -! LIBS="$saved_LIBS $IMG_LIBS" - - AC_SUBST([WINDRES]) - AC_SUBST([IMG_LIBS]) -+ AC_SUBST([LIBS]) - - # Finally create all the generated files - AC_OUTPUT([ - Makefile - SDL_image.spec - SDL_image.qpg -+ sdl-image.pc - ]) - -Diff finished. Wed Sep 17 21:44:24 2008