diff options
author | joerg <joerg> | 2006-05-19 19:09:18 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-05-19 19:09:18 +0000 |
commit | 87f6257970f23ebcc0e01833132af99b002ef412 (patch) | |
tree | dda499a10cde3ca36f4b064e68dd118756125054 /multimedia | |
parent | b3b8809eaf525ead9b760b417445772398e9a763 (diff) | |
download | pkgsrc-87f6257970f23ebcc0e01833132af99b002ef412.tar.gz |
Fix pthread detection. Remove some always_inline, which can break with
GCC 3.4.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gxine/distinfo | 5 | ||||
-rw-r--r-- | multimedia/gxine/patches/patch-ad | 34 | ||||
-rw-r--r-- | multimedia/gxine/patches/patch-ak | 25 |
3 files changed, 59 insertions, 5 deletions
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo index f2a9cdb33e3..f09eba04347 100644 --- a/multimedia/gxine/distinfo +++ b/multimedia/gxine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2006/05/03 12:47:47 drochner Exp $ +$NetBSD: distinfo,v 1.14 2006/05/19 19:09:18 joerg Exp $ SHA1 (gxine-0.5.6.tar.bz2) = b0ce711288010dbf8fe6e2c9186fd0397ea97f80 RMD160 (gxine-0.5.6.tar.bz2) = eda487522d005fa6f3b395287dc9cefc1983aa2f @@ -6,12 +6,13 @@ Size (gxine-0.5.6.tar.bz2) = 947896 bytes SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52 SHA1 (patch-ac) = f8ace1735fe3927c66e26d52f4a6094517483eaa +SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852 SHA1 (patch-af) = b2805824e77cd1f0e6f8fbab74563ee062053cce SHA1 (patch-ag) = f814a4e0c6706d3e588180e1dcfacd97204cb8cd SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86 SHA1 (patch-ai) = 46a40d08b77e10a3d96bdf61ac31e1f02eba65e8 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d -SHA1 (patch-ak) = fc4000e733b18dfd6da97a0c9cb5d6ad2dea1dff +SHA1 (patch-ak) = d4200f0a622ee0aa729a5dd7e7b48f4771f929a4 SHA1 (patch-al) = f1b96dacdb11ea18d714162a1bd5e957aa74dfbb SHA1 (patch-am) = 25e7e53bd56cd30cf06dd010f78ed0715767421a SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5 diff --git a/multimedia/gxine/patches/patch-ad b/multimedia/gxine/patches/patch-ad new file mode 100644 index 00000000000..14db9390852 --- /dev/null +++ b/multimedia/gxine/patches/patch-ad @@ -0,0 +1,34 @@ +$NetBSD: patch-ad,v 1.6 2006/05/19 19:09:18 joerg Exp $ + +--- src/menu.c.orig 2006-05-19 17:58:22.000000000 +0000 ++++ src/menu.c +@@ -255,7 +255,7 @@ void menu_add_items (GtkUIManager *ui, c + * Requires a function body, to which is passed int v = radio action value + */ + #define JS_CB_R(func) \ +- static always_inline void js_##func##_cb_int (int); \ ++ static void js_##func##_cb_int (int); \ + static void js_##func##_cb (GtkRadioAction *action, gpointer data) \ + { \ + /* \ +@@ -266,17 +266,17 @@ void menu_add_items (GtkUIManager *ui, c + */ \ + js_##func##_cb_int (gtk_radio_action_get_current_value (action)); \ + } \ +- static always_inline void js_##func##_cb_int (int v) ++ static void js_##func##_cb_int (int v) + /* function body goes here */ + + /* Toggle action callback (no Javascript) + * Requires a function body, to which is passed gboolean v = toggle state + */ + #define JS_CB_T(func) \ +- static always_inline void js_##func##_cb_int (gboolean); \ ++ static void js_##func##_cb_int (gboolean); \ + static void js_##func##_cb (GtkToggleAction *action, gpointer data) \ + { js_##func##_cb_int (gtk_toggle_action_get_active (action)); } \ +- static always_inline void js_##func##_cb_int (gboolean v) ++ static void js_##func##_cb_int (gboolean v) + /* function body goes here */ + + /* File */ diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak index e614fed89d8..21ea1fbe577 100644 --- a/multimedia/gxine/patches/patch-ak +++ b/multimedia/gxine/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 2006/05/03 12:47:47 drochner Exp $ +$NetBSD: patch-ak,v 1.5 2006/05/19 19:09:18 joerg Exp $ ---- configure.orig 2006-03-16 18:38:37.000000000 +0100 +--- configure.orig 2006-04-29 23:44:54.000000000 +0000 +++ configure -@@ -24585,6 +24585,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -24730,6 +24730,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xinerama_XineramaQueryExtension=yes @@ -10,3 +10,22 @@ $NetBSD: patch-ak,v 1.4 2006/05/03 12:47:47 drochner Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +@@ -24923,14 +24924,14 @@ case $host in + LDFLAGS="$LDFLAGS -L/usr/local/lib" + ;; + *) +- THREAD_LIBS="-lpthread" +- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ++ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF |