diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/xosd/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/xosd/Manifest | 10 | ||||
| -rw-r--r-- | x11-libs/xosd/files/2.2.4-font-align.patch | 24 | ||||
| -rw-r--r-- | x11-libs/xosd/files/bmp-dlg_config.patch | 11 | ||||
| -rw-r--r-- | x11-libs/xosd/files/digest-xosd-2.2.12 | 1 | ||||
| -rw-r--r-- | x11-libs/xosd/xosd-2.2.12.ebuild | 80 |
6 files changed, 105 insertions, 29 deletions
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog index 78188dfd26d6..c849c2805e6d 100644 --- a/x11-libs/xosd/ChangeLog +++ b/x11-libs/xosd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/xosd # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.40 2004/10/17 11:03:33 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.41 2004/11/06 15:12:17 lanius Exp $ + +*xosd-2.2.12 (06 Nov 2004) + + 06 Nov 2004; <heino@gentoo.org> -files/2.2.4-font-align.patch, + +files/bmp-dlg_config.patch, +xosd-2.2.12.ebuild: + version bump, add bmp mediaplayer support, bug #69213 17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xosd-2.2.8-r1.ebuild: stable on amd64. diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest index bcd421a10532..fadce9660d50 100644 --- a/x11-libs/xosd/Manifest +++ b/x11-libs/xosd/Manifest @@ -1,11 +1,13 @@ -MD5 3fee49f8e9899d64d0dea58d34e311dc ChangeLog 5218 +MD5 1e1da83d153aac7bf103046d456586df xosd-2.2.8-r1.ebuild 1037 +MD5 2ac743dabe6e48195f32e6856e94253a xosd-2.2.12.ebuild 2543 +MD5 fc20c42526f56afaf96e6f1ab58ca389 ChangeLog 5418 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253 MD5 e5c60617c1930e10cafc2bde2a1af1be xosd-2.2.5-r1.ebuild 1035 -MD5 1e1da83d153aac7bf103046d456586df xosd-2.2.8-r1.ebuild 1037 MD5 2f0363360b2ffab1a1570bed56415903 xosd-2.2.10.ebuild 1037 -MD5 3c380aec54baadc4ae387d9cbba2d714 files/2.2.4-font-align.patch 640 +MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403 MD5 7012b7e17c6cf060995e65335222ea2b files/2.2.5-xmms-trackpos.patch 4001 MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5-r1 62 -MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167 MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63 MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64 +MD5 83fccda3ae130b4fa467759640ca4efe files/digest-xosd-2.2.12 64 +MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167 diff --git a/x11-libs/xosd/files/2.2.4-font-align.patch b/x11-libs/xosd/files/2.2.4-font-align.patch deleted file mode 100644 index 701f1859dc05..000000000000 --- a/x11-libs/xosd/files/2.2.4-font-align.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/xmms_plugin/xmms_osd.c.orig 2003-09-10 00:02:07.738701608 -0400 -+++ src/xmms_plugin/xmms_osd.c 2003-09-10 00:02:25.132057416 -0400 -@@ -261,6 +261,10 @@ - DEBUG("apply_config"); - if (osd) - { -+ if (xosd_set_font (osd, font) == -1) -+ { -+ DEBUG("invalid font %s", font); -+ } - xosd_set_colour (osd, colour); - xosd_set_timeout (osd, timeout); - xosd_set_vertical_offset (osd, offset); -@@ -269,10 +273,6 @@ - xosd_set_outline_offset (osd, outline_offset); - xosd_set_pos (osd, pos); - xosd_set_align (osd, align); -- if (xosd_set_font (osd, font) == -1) -- { -- DEBUG("invalid font %s", font); -- } - } - DEBUG("done"); - } diff --git a/x11-libs/xosd/files/bmp-dlg_config.patch b/x11-libs/xosd/files/bmp-dlg_config.patch new file mode 100644 index 000000000000..b307d52ce352 --- /dev/null +++ b/x11-libs/xosd/files/bmp-dlg_config.patch @@ -0,0 +1,11 @@ +--- dlg_config.c.orig 2003-10-02 19:09:32.000000000 -0500 ++++ dlg_config.c 2004-10-28 22:29:26.737862128 -0500 +@@ -278,7 +279,7 @@ + + read_config(); + +- configure_win = gtk_window_new(GTK_WINDOW_DIALOG); ++ configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", + GTK_SIGNAL_FUNC(gtk_widget_destroyed), &configure_win); diff --git a/x11-libs/xosd/files/digest-xosd-2.2.12 b/x11-libs/xosd/files/digest-xosd-2.2.12 new file mode 100644 index 000000000000..e1f48aea48cf --- /dev/null +++ b/x11-libs/xosd/files/digest-xosd-2.2.12 @@ -0,0 +1 @@ +MD5 756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2 287514 diff --git a/x11-libs/xosd/xosd-2.2.12.ebuild b/x11-libs/xosd/xosd-2.2.12.ebuild new file mode 100644 index 000000000000..ae3e844e5d13 --- /dev/null +++ b/x11-libs/xosd/xosd-2.2.12.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.12.ebuild,v 1.1 2004/11/06 15:12:17 lanius Exp $ + +inherit eutils + +IUSE="xinerama xmms bmp" + +DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line" +HOMEPAGE="http://www.ignavus.net/" +SRC_URI="http://www.ignavus.net/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64" + +DEPEND="virtual/x11 + bmp? (media-sound/beep-media-player >=media-libs/gdk-pixbuf-0.22.0 ) + xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/2.2.8-xmms-trackpos.patch +} + +src_compile() { + local myconf="" + + use xinerama || myconf="${myconf} --disable-xinerama" + + use xmms || use bmp || myconf="${myconf} --disable-new-plugin" + + if use bmp ; then + # The files from xmms_plugin need to be copied over and patched with sed and epatch + mkdir ${S}/src/bmp_plugin + cp ${S}/src/xmms_plugin/* ${S}/src/bmp_plugin/ + + # Add the bmp_plugin directory to the configure script + sed -i -e 's: src/xmms_plugin/Makefile : src/xmms_plugin/Makefile src/bmp_plugin/Makefile :g' configure + + # Add the directory to the Makefile.* files in the src/ directory so that the Makefile + # will be generated properly + cd ${S}/src + echo "Makefile.in + Makefile.am" | xargs sed -i -e 's:xmms_plugin:xmms_plugin bmp_plugin:g' + + # Convert the right "xmms"es to "bmp"s + cd ${S}/src/bmp_plugin + echo "Makefile + Makefile.in" | xargs sed -i -e 's:libxmms_osd:libbmp_osd:g' -e 's:/xmms/:/bmp/:g' + + # Finally, apply a trivial patch + epatch ${FILESDIR}/bmp-dlg_config.patch + + cd ${S} + fi + + econf ${myconf} || die + + # Since the "--disable-new-plugin" flag was enabled if the 'bmp' or 'xmms' USE flag was specified, + # the src/xmms_plugin directory has to be manually removed from the Makefile in the src/ directory + # if the user didn't want the xmms plugin to be compiled + use xmms || (cd ${S}/src && sed -i -e 's:xmms_plugin::g' Makefile) + # Fix some things not done right by econf in the src/bmp_plugin directory + use bmp && (cd ${S}/src/bmp_plugin && sed -i -e 's:xmms-config:beep-config:g' -e 's:libdir)/xmms:libdir)/bmp:g' -e 's:-lxmms:-lbeep:g' -e 's:xmms/:bmp/:g' Makefile) + + cd ${S} + + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + dodoc AUTHORS ChangeLog NEWS COPYING README + + if [ -d ${D}no ]; then + rmdir ${D}no + fi +} |