diff options
| -rw-r--r-- | media-video/xine-ui/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/xine-ui/Manifest | 14 | ||||
| -rw-r--r-- | media-video/xine-ui/files/digest-xine-ui-0.99.3_pre20041022-r1 | 1 | ||||
| -rw-r--r-- | media-video/xine-ui/files/xine-ui-configure-checks.patch | 92 | ||||
| -rw-r--r-- | media-video/xine-ui/files/xine-ui-desktop-fixes.patch | 37 | ||||
| -rw-r--r-- | media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild | 67 |
6 files changed, 210 insertions, 11 deletions
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog index 33f2b2dd8a7b..26d5368929d3 100644 --- a/media-video/xine-ui/ChangeLog +++ b/media-video/xine-ui/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/xine-ui # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.71 2005/03/29 05:18:32 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.72 2005/03/29 06:06:09 chriswhite Exp $ + +*xine-ui-0.99.3_pre20041022-r1 (29 Mar 2005) + + 29 Mar 2005; Chris White <chriswhite@gentoo.org> + +files/xine-ui-configure-checks.patch, +files/xine-ui-desktop-fixes.patch, + +xine-ui-0.99.3_pre20041022-r1.ebuild: + Fixed bug #58157 (xine-ui desktop / depend fixes). Thanks to Diego for the + ebuild. 29 Mar 2005; Chris White <chriswhite@gentoo.org> xine-ui-0.9.23-r2.ebuild, xine-ui-0.99.3_pre20041022.ebuild: diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest index 634b91522a77..9377205a2893 100644 --- a/media-video/xine-ui/Manifest +++ b/media-video/xine-ui/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 9f43d0bc44fc991dee18c09e205a8cee ChangeLog 11340 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 MD5 871ab1252b5ad1b44a13cf76b370b3d1 xine-ui-0.9.21-r1.ebuild 1607 @@ -12,6 +9,7 @@ MD5 7e1c68a1102e1f87b51f007419a53747 xine-ui-0.99.1.ebuild 1488 MD5 01994eb77ebdb72cbe431b17d9b64f96 xine-ui-0.99.2.ebuild 1501 MD5 00b711d4ba64bd1067623be007133d92 xine-ui-0.99.3.ebuild 1600 MD5 484aed56116df5fa32309a33dae2e8f4 xine-ui-0.99.3_pre20041022.ebuild 1340 +MD5 b00de139385bfbe4df4cf9b85b5a614a xine-ui-0.99.3_pre20041022-r1.ebuild 1547 MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r2 67 @@ -31,10 +29,6 @@ MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298 MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336 MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216 MD5 92d5d365d60b97698c865beaede2b594 files/xine.desktop 296 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCSN2RFdQwWVoAgN4RAk/MAJ451Ui71cASIuAWCLeesDQC56w9eACgnp/P -HC5Ths3k89DKTpcnECpItZg= -=0qAW ------END PGP SIGNATURE----- +MD5 9175202497674c66eeaf933435fdb0b0 files/xine-ui-configure-checks.patch 2822 +MD5 601b34bc4b9a6493bd43a38d67777d33 files/xine-ui-desktop-fixes.patch 1285 +MD5 1c7ec60b24fe2cd95f8e352de316894b files/digest-xine-ui-0.99.3_pre20041022-r1 79 diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.3_pre20041022-r1 b/media-video/xine-ui/files/digest-xine-ui-0.99.3_pre20041022-r1 new file mode 100644 index 000000000000..d3d4956fc073 --- /dev/null +++ b/media-video/xine-ui/files/digest-xine-ui-0.99.3_pre20041022-r1 @@ -0,0 +1 @@ +MD5 d311d5f573ca4f2ebc7491b3dbe8b28b xine-ui-0.99.3_pre20041022.tar.gz 2696086 diff --git a/media-video/xine-ui/files/xine-ui-configure-checks.patch b/media-video/xine-ui/files/xine-ui-configure-checks.patch new file mode 100644 index 000000000000..d0360b1e7b48 --- /dev/null +++ b/media-video/xine-ui/files/xine-ui-configure-checks.patch @@ -0,0 +1,92 @@ +diff -x '*~' -Npaur xine-ui-0.99.3-orig/configure.ac xine-ui-0.99.3-configure/configure.ac +--- xine-ui-0.99.3-orig/configure.ac 2005-03-20 15:31:48.902037336 +0100 ++++ xine-ui-0.99.3-configure/configure.ac 2005-03-20 17:08:21.006425264 +0100 +@@ -315,7 +315,10 @@ AM_CONDITIONAL(HAVE_XTESTEXTENSION, test + dnl + dnl readline + dnl +-AC_CHECK_READLINE ++if test x"$with_readline" != xno; then ++ AC_CHECK_READLINE ++fi ++ + AM_CONDITIONAL(HAVE_READLINE, test x"$have_readline" = "xyes") + if test x"$have_readline" != "xyes"; then + AC_MSG_RESULT([*** no readline found, xine network interface will be disabled ***]) +@@ -324,20 +327,35 @@ fi + dnl + dnl ncurses + dnl +-AC_CHECK_HEADERS(curses.h) +-AC_CHECK_LIB(ncurses, cbreak, +- AC_DEFINE(HAVE_NCURSES,,[Define this if you have ncurses installed]) +- ac_have_ncurses="yes" +- NCURSES_LIB="-lncurses") +-AC_SUBST(NCURSES_LIB) ++AC_ARG_WITH(ncurses, ++ [ --without-ncurses Turn off ncurses support.], ++ [], with_ncurses=yes) ++ ++if test x"$with_ncurses" = xyes; then ++ AC_CHECK_HEADERS(curses.h) ++ AC_CHECK_LIB(ncurses, cbreak, ++ AC_DEFINE(HAVE_NCURSES,,[Define this if you have ncurses installed]) ++ ac_have_ncurses="yes" ++ NCURSES_LIB="-lncurses") ++ AC_SUBST(NCURSES_LIB) ++fi ++ + AM_CONDITIONAL(HAVE_NCURSES, test x$ac_have_ncurses = "xyes") + + dnl + dnl Libcurl + dnl +-AM_PATH_CURL(7.10.2, [ +- AC_DEFINE(HAVE_CURL,,[Define this if you have libcurl installed])], [ +- AC_MSG_RESULT(*** All of curl dependent parts will be disabled ***)]) ++AC_ARG_WITH(curl, ++ [ --without-curl Turn off curl support.], ++ [], with_curl=yes) ++ ++if test x"$with_curl" = xyes; then ++ AM_PATH_CURL(7.10.2, [ ++ AC_DEFINE(HAVE_CURL,,[Define this if you have libcurl installed])], [ ++ AC_MSG_RESULT(*** All of curl dependent parts will be disabled ***)]) ++else ++ no_curl=yes ++fi + AM_CONDITIONAL(HAVE_CURL, test x$no_curl != "xyes") + + +@@ -352,13 +370,29 @@ AC_SUBST(NET_LIBS) + dnl + dnl check for ascii-art library + dnl +-AM_PATH_AALIB(1.2.0,,) ++AC_ARG_WITH(aalib, ++ [ --without-aalib Turn off AALIB support.], ++ [], with_aalib=yes) ++ ++if test x"$with_aalib" = xyes; then ++ AM_PATH_AALIB(1.2.0,,) ++else ++ no_aalib=yes ++fi + AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") + + dnl + dnl checks for Color AsCii Art library + dnl +-AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***])) ++AC_ARG_WITH(libcaca, ++ [ --without-libcaca Turn off CACA support.], ++ [], with_libcaca=yes) ++ ++if test x"$with_libcaca" = xyes; then ++ AM_PATH_CACA(0.3,, AC_MSG_RESULT([*** All CACA-dependent parts will be disabled ***])) ++else ++ no_caca=yes ++fi + AM_CONDITIONAL(HAVE_CACA, test x$no_caca != "xyes") + + dnl option for font sets and multibyte string support diff --git a/media-video/xine-ui/files/xine-ui-desktop-fixes.patch b/media-video/xine-ui/files/xine-ui-desktop-fixes.patch new file mode 100644 index 000000000000..aa3ab110c497 --- /dev/null +++ b/media-video/xine-ui/files/xine-ui-desktop-fixes.patch @@ -0,0 +1,37 @@ +diff -x '*~' -Npaur xine-ui-0.99.3-orig/misc/desktops/Makefile.am xine-ui-0.99.3-desktop/misc/desktops/Makefile.am +--- xine-ui-0.99.3-orig/misc/desktops/Makefile.am 2005-03-20 15:31:48.819049952 +0100 ++++ xine-ui-0.99.3-desktop/misc/desktops/Makefile.am 2005-03-20 16:23:29.820626056 +0100 +@@ -1,14 +1,6 @@ +-EXTRA_DIST = $(pixmap_DATA) $(desktop_DATA) xine.wmconfig ++EXTRA_DIST = $(desktop_DATA) xine.wmconfig + +-pixmapdir = $(datadir)/pixmaps +- +-pixmap_DATA = xine_16x16.png \ +- xine_22x22.png \ +- xine_32x32.png \ +- xine_48x48.png \ +- xine.xpm +- +-desktopdir = $(datadir)/xine/desktop ++desktopdir = $(datadir)/applications + desktop_DATA = xine.desktop + + debug: +diff -x '*~' -Npaur xine-ui-0.99.3-orig/misc/desktops/xine.desktop xine-ui-0.99.3-desktop/misc/desktops/xine.desktop +--- xine-ui-0.99.3-orig/misc/desktops/xine.desktop 2005-03-20 15:31:48.820049800 +0100 ++++ xine-ui-0.99.3-desktop/misc/desktops/xine.desktop 2005-03-20 16:30:43.909634496 +0100 +@@ -1,8 +1,10 @@ + [Desktop Entry] ++Encoding=UTF-8 + Name=xine + Comment=Video Player + Exec=xine + MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2; +-Icon=xine.xpm +-Terminal=0 ++Icon=xine ++Terminal=false + Type=Application ++Categories=Application;AudioVideo;Player; +\ No newline at end of file diff --git a/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild new file mode 100644 index 000000000000..b4df1d2088c1 --- /dev/null +++ b/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3_pre20041022-r1.ebuild,v 1.1 2005/03/29 06:06:09 chriswhite Exp $ + +inherit eutils + +DESCRIPTION="Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="mirror://sourceforge/xine/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc" +IUSE="X nls lirc aalib libcaca readline curl ncurses" + +S=${WORKDIR}/${PN} + +DEPEND="media-libs/libpng + >=media-libs/xine-lib-1.0 + lirc? ( app-misc/lirc ) + X? ( virtual/x11 ) + aalib? ( media-libs/aalib ) + gnome? ( =gnome-base/orbit-0* ) + directfb? ( >=dev-libs/DirectFB-0.9.9 ) + curl?( >=net-misc/curl-7.10.2 ) + libcaca? (media-libs/libcaca) + ncurses? (sys-libs/ncurses)" +RDEPEND="nls? ( sys-devel/gettext )" + +src_unpack() { + + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-configure-checks.patch + epatch ${FILESDIR}/${PN}-desktop-fixes.patch +} + +src_compile() { + + ./autogen.sh + + econf \ + $(use_enable lirc) \ + $(use_enable nls) \ + $(use_with X x) \ + $(use_with aalib) \ + $(use_with libcaca) \ + $(use_with curl) \ + $(use_with readline) \ + $(use_with ncurses) \ + || die + emake || die +} + +src_install() { + make DESTDIR=${D} \ + docdir=/usr/share/doc/${PF} \ + docsdir=/usr/share/doc/${PF} \ + install || die + + for res in 16 22 32 48; do + insinto /usr/share/icons/hicolor/${res}x${res}/apps + newins ${S}/misc/desktops/xine_${res}x${res}.png xine.png + done + + dodoc AUTHORS ChangeLog INSTALL NEWS README +} |