From 6ec052cf0887fee9ff40a339d09d250dbe96d1cb Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 5 Jan 2007 14:54:29 +0000 Subject: update to 0.5.9 New features: prevent screen blanking in windowed mode; show time remaining; include a JPEG version of the logo for when distributors are scared to include MPEG codecs in xine-lib. gxine also now knows about xscreensaver. And some minor fixes. --- multimedia/gxine/Makefile | 5 ++--- multimedia/gxine/distinfo | 14 +++++------- multimedia/gxine/patches/patch-ac | 14 ------------ multimedia/gxine/patches/patch-ak | 12 +++++------ multimedia/gxine/patches/patch-al | 45 --------------------------------------- multimedia/gxine/patches/patch-am | 13 ----------- multimedia/gxine/patches/patch-ap | 12 ----------- 7 files changed, 13 insertions(+), 102 deletions(-) delete mode 100644 multimedia/gxine/patches/patch-ac delete mode 100644 multimedia/gxine/patches/patch-al delete mode 100644 multimedia/gxine/patches/patch-am delete mode 100644 multimedia/gxine/patches/patch-ap (limited to 'multimedia') diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index e476a9e852b..3cd92ee4999 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2006/11/28 21:49:57 drochner Exp $ +# $NetBSD: Makefile,v 1.29 2007/01/05 14:54:29 drochner Exp $ -DISTNAME= gxine-0.5.8 -PKGREVISION= 1 +DISTNAME= gxine-0.5.9 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo index 0693bc7b00a..4fdab08094f 100644 --- a/multimedia/gxine/distinfo +++ b/multimedia/gxine/distinfo @@ -1,21 +1,17 @@ -$NetBSD: distinfo,v 1.17 2006/10/17 16:23:47 drochner Exp $ +$NetBSD: distinfo,v 1.18 2007/01/05 14:54:29 drochner Exp $ -SHA1 (gxine-0.5.8.tar.bz2) = 55aa45fae3fbfba7610e36f82f53f627c2a68635 -RMD160 (gxine-0.5.8.tar.bz2) = 726faf60beb54e7cf033e7f03850c04d0d63693e -Size (gxine-0.5.8.tar.bz2) = 1014295 bytes +SHA1 (gxine-0.5.9.tar.bz2) = 7826de5f80e4c99ba1eb3651868e2eb29385c36b +RMD160 (gxine-0.5.9.tar.bz2) = 1e5a521e0e494c339caf51a90933494aba680815 +Size (gxine-0.5.9.tar.bz2) = 1023087 bytes SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52 -SHA1 (patch-ac) = f8ace1735fe3927c66e26d52f4a6094517483eaa SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852 SHA1 (patch-af) = dbea07d9c9df05ae523bca1642eb844c45e5a459 SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692 SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86 SHA1 (patch-ai) = 5f90f28584b9248a38f58790575524ebbd33db57 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d -SHA1 (patch-ak) = f13bc48f7c836405a0587e378cc7ec0de5a4710e -SHA1 (patch-al) = edd6f33b53f2cbe8d9ca8d609cf80ddb8d210cd9 -SHA1 (patch-am) = 25e7e53bd56cd30cf06dd010f78ed0715767421a +SHA1 (patch-ak) = 3eb0dea3337748d35be1aaff9f610a91c8b8d97b SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5 SHA1 (patch-ao) = 97e176786b0e910913ecea018b5948401f69c379 -SHA1 (patch-ap) = 83a6207bff9cde002d592e30637d111e35009c16 SHA1 (patch-aq) = e9f17986a2f7387cebdbbd5ddd6e0bc97eb87d0a diff --git a/multimedia/gxine/patches/patch-ac b/multimedia/gxine/patches/patch-ac deleted file mode 100644 index 10c258ce5b0..00000000000 --- a/multimedia/gxine/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2006/05/03 12:47:47 drochner Exp $ - ---- src/desktop_integration.c.orig 2006-03-07 22:26:26.000000000 +0100 -+++ src/desktop_integration.c -@@ -31,7 +31,9 @@ - #include - #include - #include -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #include -+#endif - #include - #include - #include diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak index 4c60b6f40a0..3ecb17899ca 100644 --- a/multimedia/gxine/patches/patch-ak +++ b/multimedia/gxine/patches/patch-ak @@ -1,16 +1,16 @@ -$NetBSD: patch-ak,v 1.6 2006/07/07 18:28:48 drochner Exp $ +$NetBSD: patch-ak,v 1.7 2007/01/05 14:54:29 drochner Exp $ ---- configure.orig 2006-07-05 03:06:45.000000000 +0200 +--- configure.orig 2006-12-17 00:37:35.000000000 +0100 +++ configure -@@ -25819,6 +25819,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +@@ -26336,6 +26336,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xinerama_XineramaQueryExtension=yes + X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -26026,14 +26027,14 @@ case $host in +@@ -26607,14 +26608,14 @@ case $host in LDFLAGS="$LDFLAGS -L/usr/local/lib" ;; *) diff --git a/multimedia/gxine/patches/patch-al b/multimedia/gxine/patches/patch-al deleted file mode 100644 index 10d3945068a..00000000000 --- a/multimedia/gxine/patches/patch-al +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-al,v 1.3 2006/10/17 16:23:47 drochner Exp $ - ---- src/engine.c.orig 2006-08-11 15:45:07.000000000 +0200 -+++ src/engine.c -@@ -36,7 +36,7 @@ - - se_t *gse; /* global script engine */ - xine_t *xine; /* global xine instance */ --pthread_mutex_t engine_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+pthread_mutex_t engine_lock; - - gboolean initialised = FALSE; - -@@ -300,9 +300,18 @@ static gboolean js_queue_cb (GtkWidget * - /* js_lock must be recursive since, if the engine is busy, this function - * WILL be re-entered from the same thread with the lock already held. - */ -- static pthread_mutex_t js_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ static pthread_mutex_t js_lock; -+ static int jslock_inited = 0; -+ pthread_mutexattr_t ma; - exec_t *js; - -+ if (!jslock_inited) { -+ pthread_mutexattr_init(&ma); -+ pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); -+ pthread_mutex_init(&js_lock, &ma); -+ jslock_inited++; -+ } -+ - pthread_mutex_lock (&js_lock); - while ((js = g_async_queue_try_pop (js_queue))) - { -@@ -428,6 +437,11 @@ void engine_init (void) - { - char *cfgfilename; - GtkWidget *w; -+ pthread_mutexattr_t ma; -+ -+ pthread_mutexattr_init(&ma); -+ pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE); -+ pthread_mutex_init(&engine_lock, &ma); - - /* - * init the global xine engine diff --git a/multimedia/gxine/patches/patch-am b/multimedia/gxine/patches/patch-am deleted file mode 100644 index 496e6a6b6e6..00000000000 --- a/multimedia/gxine/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/05/03 12:47:47 drochner Exp $ - ---- src/script_engine.c.orig 2006-03-16 18:27:36.000000000 +0100 -+++ src/script_engine.c -@@ -1742,7 +1742,7 @@ se_t *se_new (void) - - pthread_mutexattr_t attr; - pthread_mutexattr_init (&attr); -- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); -+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init (&se->lock, &attr); - pthread_mutexattr_destroy (&attr); - diff --git a/multimedia/gxine/patches/patch-ap b/multimedia/gxine/patches/patch-ap deleted file mode 100644 index 4fc4ee0d906..00000000000 --- a/multimedia/gxine/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2006/05/03 12:47:47 drochner Exp $ - ---- src/player.c.orig 2006-05-03 12:26:47.000000000 +0200 -+++ src/player.c -@@ -162,7 +162,6 @@ static void *play_exec (void *queue_gen) - } - - g_idle_add ((GSourceFunc)playlist_logo, NULL); -- gdk_threads_leave (); - goto done; - } - -- cgit v1.2.3