aboutsummaryrefslogtreecommitdiff
path: root/misc/xosd
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2003-03-31 05:05:05 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2003-03-31 05:05:05 +0000
commit683113cb1c11f5bc0876cdc6b24e7f0a1430f8f1 (patch)
tree847502a6c487b30e22d3ce5331bb76808ef00401 /misc/xosd
parent84cfee66af2eb07b94e18516bf9cd6580b73d672 (diff)
downloadports-683113cb1c11f5bc0876cdc6b24e7f0a1430f8f1.tar.gz
ports-683113cb1c11f5bc0876cdc6b24e7f0a1430f8f1.zip
Update to 2.1.3
Notes
Notes: svn path=/head/; revision=77804
Diffstat (limited to 'misc/xosd')
-rw-r--r--misc/xosd/Makefile2
-rw-r--r--misc/xosd/distinfo2
-rw-r--r--misc/xosd/files/patch-src-xmms_plugin-Makefile.am8
-rw-r--r--misc/xosd/files/patch-xosd.c27
-rw-r--r--misc/xosd/pkg-plist4
5 files changed, 16 insertions, 27 deletions
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 441291a4456e..3cf1f34abeab 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xosd
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.3
CATEGORIES= misc
MASTER_SITES= http://www.ignavus.net/ \
${MASTER_SITE_LOCAL}
diff --git a/misc/xosd/distinfo b/misc/xosd/distinfo
index ad0a41e003e6..736a084fcc15 100644
--- a/misc/xosd/distinfo
+++ b/misc/xosd/distinfo
@@ -1 +1 @@
-MD5 (xosd-2.1.0.tar.gz) = 2586f11cf1c4a13f36793ed45f2929c4
+MD5 (xosd-2.1.3.tar.gz) = 400315c785735d19cddaa98c78808448
diff --git a/misc/xosd/files/patch-src-xmms_plugin-Makefile.am b/misc/xosd/files/patch-src-xmms_plugin-Makefile.am
index a075aebe4d25..f5640ade051c 100644
--- a/misc/xosd/files/patch-src-xmms_plugin-Makefile.am
+++ b/misc/xosd/files/patch-src-xmms_plugin-Makefile.am
@@ -1,10 +1,10 @@
---- src/xmms_plugin/Makefile.am.orig Mon Dec 30 22:25:03 2002
-+++ src/xmms_plugin/Makefile.am Mon Dec 30 22:24:41 2002
+--- src/xmms_plugin/Makefile.am.orig Sun Mar 2 12:06:14 2003
++++ src/xmms_plugin/Makefile.am Mon Mar 31 13:58:03 2003
@@ -1,6 +1,6 @@
# XMMS library
--CFLAGS=@CFLAGS@ @XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ -I..
-+CFLAGS=-I.. @CFLAGS@ @XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@
+-AM_CFLAGS=@XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ -I..
++AM_CFLAGS=-I.. @XMMS_CFLAGS@ @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ -I..
xmmsplugindir = ${XMMS_PLUGIN_DIR}
diff --git a/misc/xosd/files/patch-xosd.c b/misc/xosd/files/patch-xosd.c
index 8450d8b08d4f..0251602472b0 100644
--- a/misc/xosd/files/patch-xosd.c
+++ b/misc/xosd/files/patch-xosd.c
@@ -1,20 +1,11 @@
---- src/libxosd/xosd.c.orig Wed Sep 18 19:52:22 2002
-+++ src/libxosd/xosd.c Wed Sep 18 19:53:00 2002
-@@ -198,7 +198,7 @@
- pthread_mutex_lock (&osd->mutex);
- if (!XCheckWindowEvent (osd->display, osd->window, ExposureMask, &report)) {
- pthread_mutex_unlock (&osd->mutex);
-- usleep (500);
-+ usleep (100000);
- continue;
- }
- pthread_mutex_unlock (&osd->mutex);
-@@ -242,7 +242,7 @@
- if (osdv == NULL) return NULL;
+--- src/libxosd/xosd.c.orig Wed Feb 19 10:53:59 2003
++++ src/libxosd/xosd.c Mon Mar 31 14:00:23 2003
+@@ -278,7 +278,7 @@
+
+ DEBUG("event thread started");
+ assert (osd);
+- usleep (500);
++ usleep (100000);
while (!osd->done) {
-- usleep (1000);
-+ usleep (200000);
- pthread_mutex_lock (&osd->mutex);
- if (osd->timeout != -1 && osd->mapped && osd->timeout_time <= time(NULL)) {
- pthread_mutex_unlock (&osd->mutex);
+ //DEBUG("checking window event");
diff --git a/misc/xosd/pkg-plist b/misc/xosd/pkg-plist
index b2f5df6b4edc..4dbe153125cb 100644
--- a/misc/xosd/pkg-plist
+++ b/misc/xosd/pkg-plist
@@ -4,11 +4,9 @@ include/xosd.h
lib/libxosd.a
lib/libxosd.la
lib/libxosd.so
-lib/libxosd.so.2
+lib/libxosd.so.3
lib/xmms/General/libxmms_osd.la
lib/xmms/General/libxmms_osd.so
-lib/xmms/General/libxmms_osd_oldplugin.la
-lib/xmms/General/libxmms_osd_oldplugin.so
share/aclocal/libxosd.m4
share/xosd/bottom-left.png
share/xosd/bottom-right.png