diff options
Diffstat (limited to 'kde-base/juk')
| -rw-r--r-- | kde-base/juk/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/juk/Manifest | 9 | ||||
| -rw-r--r-- | kde-base/juk/files/configure-fix-kdemultimedia-juk.patch | 135 | ||||
| -rw-r--r-- | kde-base/juk/files/digest-juk-3.4.2 | 1 | ||||
| -rw-r--r-- | kde-base/juk/juk-3.4.2.ebuild | 42 |
5 files changed, 191 insertions, 4 deletions
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog index 1889f0311a41..89cc390af228 100644 --- a/kde-base/juk/ChangeLog +++ b/kde-base/juk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/juk # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.15 2005/07/08 04:13:23 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.16 2005/07/28 21:16:10 danarmak Exp $ + +*juk-3.4.2 (28 Jul 2005) + + 28 Jul 2005; Dan Armak <danarmak@gentoo.org> + +files/configure-fix-kdemultimedia-juk.patch, +juk-3.4.2.ebuild: + Version bump to 3.4.2. 08 Jul 2005; Jason Wever <weeve@gentoo.org> juk-3.4.1.ebuild: Stable on SPARC. diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest index 12b1a5763012..af273e0271fd 100644 --- a/kde-base/juk/Manifest +++ b/kde-base/juk/Manifest @@ -1,6 +1,9 @@ -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 3617608c02cf6b42c2aca3889d0b2afc ChangeLog 2280 -MD5 58e2bf1f9b58d36b79b235df8a9318e8 juk-3.4.0.ebuild 1089 MD5 ec445dac6f93f19d62a5ea6cce9087dc juk-3.4.1.ebuild 1084 +MD5 58e2bf1f9b58d36b79b235df8a9318e8 juk-3.4.0.ebuild 1089 +MD5 3617608c02cf6b42c2aca3889d0b2afc ChangeLog 2280 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 9985571cf56920cccaac0cbebadf3cc4 juk-3.4.2.ebuild 1366 MD5 1b6b47988f359abcece7b1f1f5b98377 files/digest-juk-3.4.0 73 MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-juk-3.4.1 227 +MD5 dfce952f93ee14ecafcfea645134aec2 files/digest-juk-3.4.2 73 +MD5 4fdb0ffd65dc5bbcb439ea875a4f1ba6 files/configure-fix-kdemultimedia-juk.patch 4482 diff --git a/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch b/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch new file mode 100644 index 000000000000..c96da48765cf --- /dev/null +++ b/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch @@ -0,0 +1,135 @@ +Index: juk/configure.in.in +=================================================================== +--- juk/configure.in.in (revision 433763) ++++ juk/configure.in.in (working copy) +@@ -20,39 +20,60 @@ + AC_SUBST(LIB_ARTS) + AC_SUBST(ARTS_CFLAGS) + +-KDE_CHECK_HEADER(tunepimp/tp_c.h, +-[ +- AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]) +- have_musicbrainz=true +-], [ +- AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz]) +- have_musicbrainz=false +-]) ++AC_ARG_WITH(musicbrainz, ++ [AS_HELP_STRING(--with-musicbrainz, ++ [enable support for MusicBrainz @<:@default=check@:>@])], ++ [], with_musicbrainz=check) + +-AM_CONDITIONAL(link_lib_MB, test x$have_musicbrainz = xtrue) ++have_musicbrainz=no ++if test "x$with_musicbrainz" != xno; then ++ KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes) + +-# pkg-config seems to have a bug where it masks needed -L entries when it +-# shouldn't, so disable that. ++ if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then ++ AC_MSG_FAILURE([--with-musicbrainz was given, but test for MusicBrainz failed]) ++ fi ++fi + +-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +-export PKG_CONFIG_ALLOW_SYSTEM_LIBS ++if test "x$have_musicbrainz" = xyes; then ++ AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]) ++else ++ AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz]) ++fi + +-dnl start with 0.8 +-GST_MAJORMINOR=0.8 +-GST_REQ=0.8.0 ++AM_CONDITIONAL(link_lib_MB, test "x$have_musicbrainz" = xyes) + +-PKG_CHECK_MODULES(GST, \ +- gstreamer-$GST_MAJORMINOR >= $GST_REQ \ +- gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \ +- gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ, +- have_gst=yes, have_gst=no) ++AC_ARG_WITH(gstreamer, ++ [AS_HELP_STRING(--with-gstreamer, ++ [enable support for GStreamer @<:@default=check@:>@])], ++ [], with_gstreamer=check) + +-dnl Give error if we don't have gstreamer ++have_gst=no ++if test "x$with_gstreamer" != xno; then ++ # pkg-config seems to have a bug where it masks needed -L entries when it ++ # shouldn't, so disable that. ++ ++ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 ++ export PKG_CONFIG_ALLOW_SYSTEM_LIBS ++ ++ dnl start with 0.8 ++ GST_MAJORMINOR=0.8 ++ GST_REQ=0.8.0 ++ ++ PKG_CHECK_MODULES(GST, \ ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ \ ++ gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \ ++ gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ, ++ have_gst=yes, have_gst=no) ++ ++ if test "x$with_gstreamer" != xcheck && test "x$have_gst" != xyes; then ++ AC_MSG_FAILURE([--with-gstreamer was given, but test for GStreamer failed]) ++ fi ++fi ++ + if test "x$have_gst" = "xno"; then + GST_CFLAGS="" + LDADD_GST="" + LDFLAGS_GST="" +- AC_MSG_WARN([GStreamer version >= $GST_REQ required.]) + AC_DEFINE(HAVE_GSTREAMER, 0, [have GStreamer]) + else + LDADD_GST=`$PKG_CONFIG --libs-only-l gstreamer-$GST_MAJORMINOR` +@@ -63,13 +84,14 @@ + LIBDIRS_GST=`$PKG_CONFIG --libs-only-L gstreamer-$GST_MAJORMINOR` + LDADD_GST="$LDADD_GST $LIBDIRS_GST" + +- AC_SUBST(GST_CFLAGS) +- AC_SUBST(LDADD_GST) +- AC_SUBST(LDFLAGS_GST) + AC_MSG_NOTICE([GStreamer version >= $GST_REQ found.]) + AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer]) + fi + +-if test "x$have_taglib" = "xfalse" || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then ++AC_SUBST(GST_CFLAGS) ++AC_SUBST(LDADD_GST) ++AC_SUBST(LDFLAGS_GST) ++ ++if test "x$have_taglib" != xyes || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then + DO_NOT_COMPILE="$DO_NOT_COMPILE juk" + fi +Index: juk/configure.in.bot +=================================================================== +--- juk/configure.in.bot (revision 433763) ++++ juk/configure.in.bot (working copy) +@@ -1,4 +1,4 @@ +-if test "x$have_taglib" = "xfalse"; then ++if test "x$with_taglib" = xcheck && test "x$have_taglib" != xyes; then + echo "**************************************************" + echo "*" + echo "* JuK will not be built without TagLib." +@@ -7,7 +7,7 @@ + echo "**************************************************" + fi + +-if test "x$have_gst" = "xno"; then ++if test "x$with_gstreamer" = xcheck && test "x$have_gst" = xno; then + echo "**************************************************" + echo "*" + echo "* You do not seem to have GStreamer >= 0.8 installed." +@@ -19,7 +19,7 @@ + echo "**************************************************" + fi + +-if test "x$have_musicbrainz" = "xfalse"; then ++if test "x$with_musicbrainz" = xcheck && test "x$have_musicbrainz" = xno; then + echo "**************************************************" + echo "*" + echo "* You do not seem to have libmusicbrainz and" diff --git a/kde-base/juk/files/digest-juk-3.4.2 b/kde-base/juk/files/digest-juk-3.4.2 new file mode 100644 index 000000000000..08c6932fbb61 --- /dev/null +++ b/kde-base/juk/files/digest-juk-3.4.2 @@ -0,0 +1 @@ +MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960 diff --git a/kde-base/juk/juk-3.4.2.ebuild b/kde-base/juk/juk-3.4.2.ebuild new file mode 100644 index 000000000000..91e128197512 --- /dev/null +++ b/kde-base/juk/juk-3.4.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $ + +KMNAME=kdemultimedia +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="Jukebox and music manager for KDE" +KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="flac gstreamer mp3 vorbis" + +# There's a configure switch for optional musicbrainz support, but there's no use flag for it, and I don't want to introduce +# a local nomusicbrainz flag +DEPEND="media-libs/taglib + media-libs/tunepimp + media-libs/musicbrainz + gstreamer? ( >=media-libs/gstreamer-0.8 + >=media-libs/gst-plugins-0.8 ) + $(deprange $PV $MAXKDEVER kde-base/akode)" + +RDEPEND="${DEPEND} + gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 ) + vorbis? ( >=media-plugins/gst-plugins-ogg-0.8 + >=media-plugins/gst-plugins-vorbis-0.8 ) + flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )" + +PATCHES="$FILESDIR/configure-fix-kdemultimedia-juk.patch" +myconf="$myconf $(use_with gstreamer)" + +KMCOPYLIB=" + libakode akode/lib/" +KMEXTRACTONLY="arts/configure.in.in + akode/lib/" + +pkg_setup() { + if ! useq arts && ! useq gstreamer; then + eerror "${PN} needs USE=\"arts\" (and kdelibs compiled with USE=\"arts\") or USE=\"gstreamer\"" + die + fi +} |