summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-03-20 23:27:37 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-03-20 23:27:37 +0000
commit7ddd6d237490b74dd94357b80951a52ab59c6499 (patch)
treed9146e3e33f212d06fdd02a11045e101125342bd /dev-libs/pwlib/files
parentModular X dependency fix, bug #123115 (diff)
downloadgentoo-2-7ddd6d237490b74dd94357b80951a52ab59c6499.tar.gz
gentoo-2-7ddd6d237490b74dd94357b80951a52ab59c6499.tar.bz2
gentoo-2-7ddd6d237490b74dd94357b80951a52ab59c6499.zip
version bump
(Portage version: 2.1_pre6-r4)
Diffstat (limited to 'dev-libs/pwlib/files')
-rw-r--r--dev-libs/pwlib/files/digest-pwlib-1.10.03
-rw-r--r--dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch48
2 files changed, 51 insertions, 0 deletions
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.0 b/dev-libs/pwlib/files/digest-pwlib-1.10.0
new file mode 100644
index 000000000000..405b316bcac2
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.10.0
@@ -0,0 +1,3 @@
+MD5 97da19588bdc25cd8b48afb135eded1d pwlib-1.10.0.tar.gz 1480233
+RMD160 5341a4d21996472665032b3cfcc184f04435ddab pwlib-1.10.0.tar.gz 1480233
+SHA256 3bcbb47600061b6872215fbc68e7f04566a93bc602fa008636c85d47be5f5c00 pwlib-1.10.0.tar.gz 1480233
diff --git a/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch b/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch
new file mode 100644
index 000000000000..bf8f4020dcda
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch
@@ -0,0 +1,48 @@
+--- pwlib-1.9.3/configure.ac.orig 2006-01-31 10:23:43.000000000 +0100
++++ pwlib-1.9.3/configure.ac 2006-02-16 00:42:27.000000000 +0100
+@@ -1476,6 +1476,7 @@
+ AC_ARG_ENABLE(sdl,
+ [ --disable-sdl disable SDL support])
+
++
+ if test "${enable_sdl}z" = "z" ; then
+ enable_sdl=$default_sdl
+ fi
+@@ -1485,6 +1486,9 @@
+ AC_MSG_NOTICE(SDL disabled)
+ AC_DEFINE(P_SDL, 0)
+ else
++ dnl check for sdl-config
++ AC_PATH_PROG([SDL_CONFIG], [sdl-config],, [$PATH:/usr/local/bin])
++
+ dnl SDL checks
+ if test "${SDLLIB:-unset}" = "unset" ; then
+ SDLLIB=SDL
+@@ -1496,7 +1500,13 @@
+ if test "${X11LIBDIR:-unset}" == "unset" ; then
+ X11LIBDIR=/usr/X11R6/lib
+ fi
+- AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
++ if test "x${SDL_CONFIG}" = "x" ; then
++ SDL_LIBS="-L${X11LIBDIR} -lpthread -lX11 -lXext -laa"
++ else
++ SDL_LIBS="`${SDL_CONFIG} --libs`"
++ fi
++
++ AC_CHECK_LIB([SDL], [SDL_CreateYUVOverlay], [HAS_SDL=1], [HAS_SDL=], [$SDL_LIBS])
+ fi
+
+ dnl freeBSD SDL check
+@@ -1516,7 +1526,11 @@
+ if test ${SDLLIBDIR:-unset} != "unset" ; then
+ LDFLAGS="$LDFLAGS -L${SDLLIBDIR}"
+ fi
+- ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}"
++ if test "x${SDL_CONFIG}" = "x" ; then
++ ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}"
++ else
++ ENDLDLIBS="$ENDLDLIBS `${SDL_CONFIG} --libs`"
++ fi
+ fi
+ fi
+ AC_SUBST(HAS_SDL)