summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-01-30 20:42:04 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-01-30 20:42:04 +0000
commit46f31c70e1873d8169ab8bc5f4887b17ccfc2a96 (patch)
tree52bc96c1b7e355ca17182c731fe98492b8232e51 /media-sound/djplay
parentVersion bump. (diff)
downloadgentoo-2-46f31c70e1873d8169ab8bc5f4887b17ccfc2a96.tar.gz
gentoo-2-46f31c70e1873d8169ab8bc5f4887b17ccfc2a96.tar.bz2
gentoo-2-46f31c70e1873d8169ab8bc5f4887b17ccfc2a96.zip
Version bump, thanks to Steven De Bock <steven_debock@yahoo.com> and masterdriverz for reviewing, bug #161936
(Portage version: 2.1.2-r5)
Diffstat (limited to 'media-sound/djplay')
-rw-r--r--media-sound/djplay/ChangeLog10
-rw-r--r--media-sound/djplay/djplay-0.5.0.ebuild69
-rw-r--r--media-sound/djplay/files/digest-djplay-0.5.03
-rw-r--r--media-sound/djplay/files/djplay-0.5.0-configure.ac.patch198
-rw-r--r--media-sound/djplay/files/djplay-0.5.0-libmpeg3.patch15
5 files changed, 294 insertions, 1 deletions
diff --git a/media-sound/djplay/ChangeLog b/media-sound/djplay/ChangeLog
index 022acd459fe6..30ac48507d00 100644
--- a/media-sound/djplay/ChangeLog
+++ b/media-sound/djplay/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-sound/djplay
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/ChangeLog,v 1.5 2007/01/05 20:55:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/ChangeLog,v 1.6 2007/01/30 20:42:04 aballier Exp $
+
+*djplay-0.5.0 (30 Jan 2007)
+
+ 30 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/djplay-0.5.0-configure.ac.patch,
+ +files/djplay-0.5.0-libmpeg3.patch, +djplay-0.5.0.ebuild:
+ Version bump, thanks to Steven De Bock <steven_debock@yahoo.com> and
+ masterdriverz for reviewing, bug #161936
05 Jan 2007; Alexis Ballier <aballier@gentoo.org> djplay-0.3.0.ebuild:
Adding libogg and libvorbis missing deps, bug #159722, thanks to Steven De
diff --git a/media-sound/djplay/djplay-0.5.0.ebuild b/media-sound/djplay/djplay-0.5.0.ebuild
new file mode 100644
index 000000000000..d51baa1b1777
--- /dev/null
+++ b/media-sound/djplay/djplay-0.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/djplay/djplay-0.5.0.ebuild,v 1.1 2007/01/30 20:42:04 aballier Exp $
+
+inherit autotools eutils qt3
+
+DESCRIPTION="A live DJing application."
+HOMEPAGE="http://djplay.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile cdparanoia mad mpeg" #sdl
+#Upstream declared that the sdl use flag won't be supported until version 0.7.0
+
+DEPEND="media-libs/alsa-lib
+ $(qt_min_version 3.2.1)
+ =dev-libs/glib-1.2*
+ media-libs/libsamplerate
+ media-libs/id3lib
+ dev-libs/libxml2
+ media-plugins/tap-plugins
+ media-plugins/swh-plugins
+ media-sound/jack-audio-connection-kit
+ media-libs/libdjconsole
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/libsdl
+ audiofile? ( media-libs/audiofile )
+ cdparanoia? ( media-sound/cdparanoia )
+ mad? ( media-libs/libmad )
+ mpeg? ( media-libs/libmpeg3 )"
+ #sdl? ( media-libs/libsdl )
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch "${FILESDIR}/${P}-configure.ac.patch"
+ epatch "${FILESDIR}/${P}-libmpeg3.patch"
+
+ eautoconf || die "eautoconf failed"
+}
+
+src_compile() {
+ local myconf
+
+ if use mpeg; then
+ myconf=--with-mpeg3includes=/usr/include/libmpeg3
+ fi
+
+ econf \
+ ${myconf} \
+ $(use_with audiofile) \
+ $(use_with cdparanoia) \
+ $(use_with mad) \
+ $(use_with mpeg) \
+ || die "econf failed"
+ #$(use_with sdl video) \
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc ChangeLog NEWS README AUTHORS
+}
diff --git a/media-sound/djplay/files/digest-djplay-0.5.0 b/media-sound/djplay/files/digest-djplay-0.5.0
new file mode 100644
index 000000000000..7b7246223f96
--- /dev/null
+++ b/media-sound/djplay/files/digest-djplay-0.5.0
@@ -0,0 +1,3 @@
+MD5 ff13f542b13c2bcbdf1cf53bbcf0ebfc djplay-0.5.0.tar.gz 560970
+RMD160 47d567c1090f225e265ee768887c57f38fb898eb djplay-0.5.0.tar.gz 560970
+SHA256 ea9ff438cf42f60cc1c812b47d8a7deb9c9c100bdbcdb0049baec4c4c5d7c81e djplay-0.5.0.tar.gz 560970
diff --git a/media-sound/djplay/files/djplay-0.5.0-configure.ac.patch b/media-sound/djplay/files/djplay-0.5.0-configure.ac.patch
new file mode 100644
index 000000000000..a44af342807e
--- /dev/null
+++ b/media-sound/djplay/files/djplay-0.5.0-configure.ac.patch
@@ -0,0 +1,198 @@
+--- configure.ac.orig 2006-12-03 18:36:01.000000000 +0100
++++ configure.ac 2007-01-13 18:24:59.000000000 +0100
+@@ -21,23 +21,26 @@
+ AC_PROG_LIBTOOL
+ AM_GNU_GETTEXT([external])
+
+-AC_ARG_WITH([mpeg3includes],[ --with-mpeg3includes=/path/to/mpeg3/includes
+- path to mpeg 3 includes to use],[
++AC_ARG_WITH([mpeg], AS_HELP_STRING([--without-mpeg], [Build without mpeg library (default: with)]),[with_mpeg=$withval],[with_mpeg=yes])
++if test "x$with_mpeg" == xyes ; then
++ AC_ARG_WITH([mpeg3includes], AS_HELP_STRING([--with-mpeg3includes=/path/to/mpeg3/includes], [
++ path to mpeg 3 includes to use]), [
+ if test "x$withval" != "x/usr/include" ; then
+ CPPFLAGS="-I$withval $CPPFLAGS"
+ fi
+ CPPFLAGS="-I$withval/audio $CPPFLAGS"
+ ],)
+-AC_ARG_WITH([mpeg3lib],[ --with-mpeg3lib=/path/to/mpeg3/lib
+- path to mpeg 3 lib to use],[LDFLAGS="-L$withval $LDFLAGS"],)
++ AC_ARG_WITH([mpeg3lib], AS_HELP_STRING([--with-mpeg3lib=/path/to/mpeg3/lib],
++ [path to mpeg 3 lib to use]) ,[LDFLAGS="-L$withval $LDFLAGS"],)
++fi
+
+-AC_ARG_WITH([uic],[ --with-uic use this uic instead of looking for it],[ac_uic=$withval])
+-AC_ARG_WITH([plugins-qtdir],[ --with-plugins-qtdir dir to install Qt plugins to],[ac_plugins_qtdir=$withval])
+-AC_ARG_WITH([ladspa-pitch],[ --with-ladspa-pitch use LADSPA pitch shifter plugin instead of SoundTouch],[
++AC_ARG_WITH([uic], AS_HELP_STRING([--with-uic], [use this uic instead of looking for it]),[ac_uic=$withval])
++AC_ARG_WITH([plugins-qtdir], AS_HELP_STRING([--with-plugins-qtdir], [dir to install Qt plugins to]),[ac_plugins_qtdir=$withval])
++AC_ARG_WITH([ladspa-pitch], AS_HELP_STRING([--with-ladspa-pitch], [use LADSPA pitch shifter plugin instead of SoundTouch]) ,[
+ AC_DEFINE([USE_LADSPA_PITCH],[1],[Define if you wish to use LADSPA pitch shifting even if SoundTouch is available])
+ ])
+-AC_ARG_WITH([SoundTouchincludes],[ --with-SoundTouchincludes=/path/to/SoundTouch/includes
+- path to SoundTouch includes to use],[
++AC_ARG_WITH([SoundTouchincludes], AS_HELP_STRING([--with-SoundTouchincludes=/path/to/SoundTouch/includes],
++ [path to SoundTouch includes to use]),[
+ if test "x$withval" != "x/usr/include" ; then
+ CPPFLAGS="-I$withval $CPPFLAGS"
+ fi
+@@ -55,9 +58,9 @@
+ AC_MSG_ERROR([dlopen() is needed for compiling DJPlay])
+ fi
+
+-AC_ARG_WITH([qt-libraries],[ --with-qt-libraries use this qt lib instead of looking for it],[QT_LIBDIR="$withval"],[QT_LIBDIR="$QTDIR/lib"])
++AC_ARG_WITH([qt-libraries],AS_HELP_STRING([--with-qt-libraries], [use this qt lib instead of looking for it]),[QT_LIBDIR="$withval"],[QT_LIBDIR="$QTDIR/lib"])
+
+-AC_ARG_WITH([qt-includes],[ --with-qt-includes use this qt include dir instead of looking for it],[QT_CPPFLAGS="-I$withval"],[QT_CPPFLAGS="-I$QTDIR/include"])
++AC_ARG_WITH([qt-includes],AS_HELP_STRING([--with-qt-includes], [use this qt include dir instead of looking for it]),[QT_CPPFLAGS="-I$withval"],[QT_CPPFLAGS="-I$QTDIR/include"])
+
+ PLUGIN_QTDIR=`dirname $QT_LIBDIR`
+ AC_SUBST(PLUGIN_QTDIR)
+@@ -119,8 +122,10 @@
+ CXXFLAGS="$CXXFLAGS $LIBDJCONSOLE_CFLAGS"
+ LIBS="$LIBDJCONSOLE_LIBS $LIBS"
+
+-AC_ARG_WITH([video],[ --with-video use video playback],[
++AC_ARG_WITH([video],AS_HELP_STRING([--with-video],[use video playback]),[with_video=$withval],[with_video=no])
++if test "x$with_video" == xyes ; then
+ AC_DEFINE([USE_VIDEO],[1],[Define if you wish to use video output])
++
+ AC_LANG([C])
+ AM_PATH_SDL([1.2.0])
+
+@@ -130,23 +135,30 @@
+ AC_CHECK_LIB(SDL, SDL_Init)
+
+ AC_LANG([C++])
+-])
++fi
+
+ #AC_CHECK_HEADERS([jack.h],[
+ # AC_CHECK_LIB([jack],[jack_client_activate],,[AC_MSG_ERROR([Jack is required for building DJPlay])])
+ #])
+
+ AC_CHECK_LIB([pthread], [pthread_create])
+-AC_CHECK_HEADERS([audiofile.h],[
+- AC_CHECK_LIB([audiofile], [afOpenFile],[
+- AC_DEFINE([HAVE_LIBAUDIOFILE],[1],[Define if you have the audiofile library])
+- LIBS="-laudiofile $LIBS"
++
++AC_ARG_WITH([audiofile], AS_HELP_STRING([--without-audiofile], [Build without audiofile library (default: with)]),[with_audiofile=$withval],[with_audiofile=yes])
++if test "x$with_audiofile" == xyes ; then
++ AC_CHECK_HEADERS([audiofile.h],[
++ AC_CHECK_LIB([audiofile], [afOpenFile],[
++ AC_DEFINE([HAVE_LIBAUDIOFILE],[1],[Define if you have the audiofile library])
++ LIBS="-laudiofile $LIBS"
++ ],[
++ dontbuild_moc="$dontbuild_moc moc_audiofile.cpp"
++ ])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_audiofile.cpp"
+ ])
+-],[
++else
+ dontbuild_moc="$dontbuild_moc moc_audiofile.cpp"
+-])
++fi
++
+
+ XIPH_PATH_VORBIS([
+ AC_DEFINE([HAVE_LIBVORBIS],[1],[Define if you have the vorbis library])
+@@ -158,29 +170,36 @@
+ OLDCXX="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I/usr/include/cdda"
+
+-AC_CHECK_HEADERS([cdda_interface.h],[
+- AC_CHECK_LIB([cdda_interface], [cdda_identify],[
+- AC_DEFINE([HAVE_LIBCDDA_INTERFACE],[1],[Define if you have the cdda_interface library])
+- AC_CHECK_HEADERS([cdda_paranoia.h],[
+- AC_CHECK_LIB([cdda_paranoia], [paranoia_init],[
+- AC_DEFINE([HAVE_LIBCDDA_PARANOIA],[1],[Define if you have the cdda_paranoia library])
+- LIBS="-lcdda_interface -lcdda_paranoia $LIBS"
++AC_ARG_WITH([cdparanoia], AS_HELP_STRING([--without-cdparanoia], [Build without cdparanoia library (default: with)]),[with_cdparanoia=$withval],[with_cdparanoia=yes])
++if test "x$with_cdparanoia" == xyes ; then
++ AC_CHECK_HEADERS([cdda_interface.h],[
++ AC_CHECK_LIB([cdda_interface], [cdda_identify],[
++ AC_DEFINE([HAVE_LIBCDDA_INTERFACE],[1],[Define if you have the cdda_interface library])
++ AC_CHECK_HEADERS([cdda_paranoia.h],[
++ AC_CHECK_LIB([cdda_paranoia], [paranoia_init],[
++ AC_DEFINE([HAVE_LIBCDDA_PARANOIA],[1],[Define if you have the cdda_paranoia library])
++ LIBS="-lcdda_interface -lcdda_paranoia $LIBS"
++ ],[
++ dontbuild_moc="$dontbuild_moc moc_cdda.cpp moc_cdlist.cpp"
++ CXXFLAGS="$OLDCXX"
++ ],[-lcdda_interface])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_cdda.cpp moc_cdlist.cpp"
+ CXXFLAGS="$OLDCXX"
+- ],[-lcdda_interface])
++ ],[#include <cdda_interface.h>])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_cdda.cpp moc_cdlist.cpp"
+ CXXFLAGS="$OLDCXX"
+- ],[#include <cdda_interface.h>])
++ ])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_cdda.cpp moc_cdlist.cpp"
+ CXXFLAGS="$OLDCXX"
+ ])
+-],[
++else
+ dontbuild_moc="$dontbuild_moc moc_cdda.cpp moc_cdlist.cpp"
+ CXXFLAGS="$OLDCXX"
+-])
++fi
++
+ AC_CHECK_HEADERS([samplerate.h],[
+ AC_CHECK_LIB([samplerate], src_callback_new,[
+ AC_DEFINE([HAVE_LIBSAMPLERATE],[1],[Define if you have libsamplerate])
+@@ -201,26 +220,37 @@
+ ],,"-lz")
+ ])
+ ])
+-AC_CHECK_HEADERS([mad.h],[
+- AC_CHECK_LIB([mad], [mad_frame_init],[
+- AC_DEFINE([HAVE_LIBMAD],[1],[Define if you have the mad library])
+- LIBS="-lmad $LIBS"
++
++AC_ARG_WITH([mad], AS_HELP_STRING([--without-mad], [Build without mad library (default: with)]),[with_mad=$withval],[with_mad=yes])
++if test "x$with_mad" == xyes ; then
++ AC_CHECK_HEADERS([mad.h],[
++ AC_CHECK_LIB([mad], [mad_frame_init],[
++ AC_DEFINE([HAVE_LIBMAD],[1],[Define if you have the mad library])
++ LIBS="-lmad $LIBS"
++ ],[
++ dontbuild_moc="$dontbuild_moc moc_mp3.cpp"
++ ])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_mp3.cpp"
+ ])
+-],[
++else
+ dontbuild_moc="$dontbuild_moc moc_mp3.cpp"
+-])
+-AC_CHECK_HEADERS([mpeg3audio.h],[
+- AC_CHECK_LIB([mpeg3], [mpeg3_check_sig],[
+- AC_DEFINE([HAVE_LIBMPEG3],[1],[Define if you have the mpeg3 library])
+- LIBS="-lmpeg3 $LIBS"
++fi
++
++if test "x$with_mpeg" == xyes ; then
++ AC_CHECK_HEADERS([mpeg3audio.h],[
++ AC_CHECK_LIB([mpeg3], [mpeg3_check_sig],[
++ AC_DEFINE([HAVE_LIBMPEG3],[1],[Define if you have the mpeg3 library])
++ LIBS="-lmpeg3 $LIBS"
++ ],[
++ dontbuild_moc="$dontbuild_moc moc_mpeg.cpp"
++ ])
+ ],[
+ dontbuild_moc="$dontbuild_moc moc_mpeg.cpp"
+ ])
+-],[
++else
+ dontbuild_moc="$dontbuild_moc moc_mpeg.cpp"
+-])
++fi
+
+ # Checks for header files.
+ AC_HEADER_DIRENT
diff --git a/media-sound/djplay/files/djplay-0.5.0-libmpeg3.patch b/media-sound/djplay/files/djplay-0.5.0-libmpeg3.patch
new file mode 100644
index 000000000000..6340f0e25bdd
--- /dev/null
+++ b/media-sound/djplay/files/djplay-0.5.0-libmpeg3.patch
@@ -0,0 +1,15 @@
+--- mpeg.cpp.old 2007-01-25 19:43:58.000000000 +0100
++++ mpeg.cpp 2007-01-25 19:45:16.000000000 +0100
+@@ -56,7 +56,12 @@
+ if(mpeg3_check_sig((char *)(const char *)file) == 0)
+ return -1;
+
++#if MPEG3_MINOR < 7
+ fp=mpeg3_open((char *)(const char *)file);
++#else
++ int error_return;
++ fp=mpeg3_open((char *)(const char *)file, &error_return);
++#endif
+ if(fp == NULL)
+ return -1;
+