diff options
author | joerg <joerg> | 2007-06-30 15:11:24 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-06-30 15:11:24 +0000 |
commit | 5a10959d042ad2924d70b43534f02451b1a57df5 (patch) | |
tree | a2a8ecbbcb8b1da63616187b9500ff0941906e8a /multimedia/gnash/patches | |
parent | 80221aa0e0aa23455e5d4fb71ed2851f869c8ecd (diff) | |
download | pkgsrc-5a10959d042ad2924d70b43534f02451b1a57df5.tar.gz |
Fix pthread linkage and large fuzz.
Diffstat (limited to 'multimedia/gnash/patches')
-rw-r--r-- | multimedia/gnash/patches/patch-aa | 21 | ||||
-rw-r--r-- | multimedia/gnash/patches/patch-ab | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa index 5243275d8d1..9eb4ce4ea96 100644 --- a/multimedia/gnash/patches/patch-aa +++ b/multimedia/gnash/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.7 2007/06/12 21:26:15 ghen Exp $ +$NetBSD: patch-aa,v 1.8 2007/06/30 15:11:24 joerg Exp $ ---- configure.orig 2007-06-09 03:41:56.000000000 +0200 +--- configure.orig 2007-06-09 01:41:56.000000000 +0000 +++ configure @@ -8239,13 +8239,13 @@ echo $ECHO_N "checking for library file LIBPRE="lib" @@ -36,7 +36,18 @@ $NetBSD: patch-aa,v 1.7 2007/06/12 21:26:15 ghen Exp $ cat >>confdefs.h <<\_ACEOF #define HAVE_WINSOCK 1 -@@ -51973,7 +51973,7 @@ if $need_sdl; then +@@ -48042,9 +48042,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + pthreads=no +-PTHREAD_LIBS="" +-PTHREAD_CFLAGS="" +- ++PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + + if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" +@@ -51973,7 +51971,7 @@ if $need_sdl; then echo " Install it from http://www.libsdl.org/download-1.2.php" echo " or .deb users: apt-get install libsdl1.2-dev" echo " or .rpm users: yum install SDL-devel" @@ -45,7 +56,7 @@ $NetBSD: patch-aa,v 1.7 2007/06/12 21:26:15 ghen Exp $ echo " or select a different GUI with --enable-gui= " x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad" && echo " or use --enable-media=gst" -@@ -52057,7 +52057,7 @@ fi +@@ -52057,7 +52055,7 @@ fi if test x"$BOOST_LIBS" != x; then # Only cygnal requires date_time at present, so it's OK if either # you don't want cygnal or do have date_time installed. @@ -54,7 +65,7 @@ $NetBSD: patch-aa,v 1.7 2007/06/12 21:26:15 ghen Exp $ echo " BOOST flags are: $BOOST_CFLAGS" echo " BOOST libs are: $BOOST_LIBS" else -@@ -52072,7 +52072,7 @@ else +@@ -52072,7 +52070,7 @@ else echo " ERROR: No BOOST development package installed!" echo " Install it from http://www.boost.org" echo " or .deb users: apt-get install libboost-thread-dev" diff --git a/multimedia/gnash/patches/patch-ab b/multimedia/gnash/patches/patch-ab index bfdcf1aa7de..3ee065f9db6 100644 --- a/multimedia/gnash/patches/patch-ab +++ b/multimedia/gnash/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2006/12/06 00:13:05 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2007/06/30 15:11:24 joerg Exp $ --- plugin/Makefile.in.orig 2006-12-06 00:14:28.000000000 +0100 +++ plugin/Makefile.in 2006-12-06 00:23:19.000000000 +0100 -@@ -952,7 +952,7 @@ +@@ -929,7 +929,7 @@ #if PLUGIN_LINK_UNDEFINED #cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so #endif |