Version bump, thanks to Steven De Bock <steven_debock@yahoo.com> and masterdriverz...

Package-Manager: portage-2.1.2-r5

diff --git a/media-sound/djplay/ChangeLog b/media-sound/djplay/ChangeLog
index 022acd459fe6eb6d2221fcd650e575cd8902c116..30ac48507d006917849586fbe46a5b48ef0c122a 100644 (file)
--- 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/Manifest b/media-sound/djplay/Manifest
index dc72835927625d5cc5523dfa4a99ab7d22a49c0e..9f6740cbf474523961cfd8bf65d58bcbb7dc8f4f 100644 (file)
--- a/media-sound/djplay/Manifest
+++ b/media-sound/djplay/Manifest
@@ -5,15 +5,28 @@ AUX djplay-0.3.0-gcc4.patch 3197 RMD160 d9a6cec1c92ecd6b165298a4905fa5917868c4b3
 MD5 ead8fae9511a95880f8cdbdf933da788 files/djplay-0.3.0-gcc4.patch 3197
 RMD160 d9a6cec1c92ecd6b165298a4905fa5917868c4b3 files/djplay-0.3.0-gcc4.patch 3197
 SHA256 4802b9ce0a136237b29d8e46e65808ef8c3a50465fbd186ab48ccdeb587d7275 files/djplay-0.3.0-gcc4.patch 3197
+AUX djplay-0.5.0-configure.ac.patch 8035 RMD160 6d2782f62010ddfaafcddae2a8d89563e4f125b4 SHA1 9179564d6172e6c4e761a18bd0e83983570a4a92 SHA256 763223940e0f73dc2f398008cd3137dd04f401213b0cb6bd565f61c8c835f641
+MD5 d42415d14d3e812f681b34319970970f files/djplay-0.5.0-configure.ac.patch 8035
+RMD160 6d2782f62010ddfaafcddae2a8d89563e4f125b4 files/djplay-0.5.0-configure.ac.patch 8035
+SHA256 763223940e0f73dc2f398008cd3137dd04f401213b0cb6bd565f61c8c835f641 files/djplay-0.5.0-configure.ac.patch 8035
+AUX djplay-0.5.0-libmpeg3.patch 389 RMD160 aedc1e073f388b0817381db1ba430728e98ee59c SHA1 54ff97dabaa7ff1be3ed3d8d6e4e130963dddda8 SHA256 856b495d95a32dc9b71cab344b9c807added6faa2c73636dcbc12f807c7edb39
+MD5 81254959679b72d178e4aa9247d93ce4 files/djplay-0.5.0-libmpeg3.patch 389
+RMD160 aedc1e073f388b0817381db1ba430728e98ee59c files/djplay-0.5.0-libmpeg3.patch 389
+SHA256 856b495d95a32dc9b71cab344b9c807added6faa2c73636dcbc12f807c7edb39 files/djplay-0.5.0-libmpeg3.patch 389
 DIST djplay-0.3.0.tar.gz 586474 RMD160 0c20de8bcc341733be7349b1d4056f9a6b1c78c1 SHA1 4784dc507683e1655dd2eb65d0e1623f55d18cb8 SHA256 7c9c4c330dd03f84943300ae507341744cc81d9cedc6e3c0bf769f2a094eaf1f
+DIST djplay-0.5.0.tar.gz 560970 RMD160 47d567c1090f225e265ee768887c57f38fb898eb SHA1 dffb5d2d1baee6d59f07ab46b86ed829eef55c42 SHA256 ea9ff438cf42f60cc1c812b47d8a7deb9c9c100bdbcdb0049baec4c4c5d7c81e
 EBUILD djplay-0.3.0.ebuild 1077 RMD160 b4e43f04f1843de952718c0013f533f015454b62 SHA1 d17e5f415dba1cf588b604fd7779556f332151ba SHA256 ab3d12bc794879f0e71ccabaac0826a2870b2c0494810ec178dbeb38f966301e
 MD5 392fdcd674e65b2f3f1cc682384744c4 djplay-0.3.0.ebuild 1077
 RMD160 b4e43f04f1843de952718c0013f533f015454b62 djplay-0.3.0.ebuild 1077
 SHA256 ab3d12bc794879f0e71ccabaac0826a2870b2c0494810ec178dbeb38f966301e djplay-0.3.0.ebuild 1077
-MISC ChangeLog 988 RMD160 937fa48c8f5ca8d44dc7dc65373556830f291e14 SHA1 0672772dfd10219c0ec6cf01b345ec5755565dd9 SHA256 d10f47b1af33b962b804e867359ffccd664bba3a02f95a3c65f30dd85e281781
-MD5 b2ca6995c5aeb106b274c2d7ef18bbcd ChangeLog 988
-RMD160 937fa48c8f5ca8d44dc7dc65373556830f291e14 ChangeLog 988
-SHA256 d10f47b1af33b962b804e867359ffccd664bba3a02f95a3c65f30dd85e281781 ChangeLog 988
+EBUILD djplay-0.5.0.ebuild 1638 RMD160 916b1cf96171be5c39e8b331dfc5647107450460 SHA1 5ce31b4a245d4d80bc73f598c2033b8bafc38081 SHA256 01b3053876a3f042bcc56ec9616294dd6f900b22370f061e2a6d227013731b60
+MD5 cd1f272e315893b1dedea178ed4d8b42 djplay-0.5.0.ebuild 1638
+RMD160 916b1cf96171be5c39e8b331dfc5647107450460 djplay-0.5.0.ebuild 1638
+SHA256 01b3053876a3f042bcc56ec9616294dd6f900b22370f061e2a6d227013731b60 djplay-0.5.0.ebuild 1638
+MISC ChangeLog 1286 RMD160 b214a891e35a68d4256178503ce8d11e72047c52 SHA1 e8585d6ee66abf7153caa95150617c9c8ad74ea4 SHA256 1ecdb2904a9b34574e392ed321eb51467de36293419ac3667ed273d99f3a2667
+MD5 9f69a1353bdafcb01517899fa8ad23cb ChangeLog 1286
+RMD160 b214a891e35a68d4256178503ce8d11e72047c52 ChangeLog 1286
+SHA256 1ecdb2904a9b34574e392ed321eb51467de36293419ac3667ed273d99f3a2667 ChangeLog 1286
 MISC metadata.xml 248 RMD160 c7f720eb33fe22c475808cefc20781099f9ca6c5 SHA1 0807051ee930d86bbb5ad31c30347f5a0ad94552 SHA256 dcb9d4fdc80f7fb9d58ef5f6e3717dce2934ae523e6ae1b9e82b9c483089cbc5
 MD5 24c788d91e0ff9ae917ac1c1fa21e18d metadata.xml 248
 RMD160 c7f720eb33fe22c475808cefc20781099f9ca6c5 metadata.xml 248
@@ -21,10 +34,13 @@ SHA256 dcb9d4fdc80f7fb9d58ef5f6e3717dce2934ae523e6ae1b9e82b9c483089cbc5 metadata
 MD5 190731d7863f8d56b259b5c25ebfb80c files/digest-djplay-0.3.0 238
 RMD160 6c9e70a9889a964ecd68a24102ec27da1cffaff4 files/digest-djplay-0.3.0 238
 SHA256 c45856e0c5c42d86dac7db881cb0ce53e3a0c5c392a94f92b13e7d39ab2125e1 files/digest-djplay-0.3.0 238
+MD5 dd81141a72fd9fcdfea46fc45affbf8a files/digest-djplay-0.5.0 238
+RMD160 59a30813db753cac4acb1baef616db82eae04aa6 files/digest-djplay-0.5.0 238
+SHA256 70638a8e4813c33555e593a1c84a795b4fc791caa47acd456506b2c06087eff6 files/digest-djplay-0.5.0 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnrtdvFcC4BYPU0oRAur+AKCO9qVziJLWwaywZCmqrhQFJuwPBwCgqV0L
-3UVav6rJ1AoJ0Yc3C/fdZYA=
-=3UbT
+iD8DBQFFv62ivFcC4BYPU0oRAlL3AJ9OL6mCCKrwG9MGpYdQh8EH6TsbPgCgutXk
+1J3iR6E3xVArlJWLLxAyAFo=
+=fLCk
 -----END PGP SIGNATURE-----

diff --git a/media-sound/djplay/djplay-0.5.0.ebuild b/media-sound/djplay/djplay-0.5.0.ebuild
new file mode 100644 (file)
index 0000000..d51baa1
--- /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 (file)
index 0000000..7b72462
--- /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 (file)
index 0000000..a44af34
--- /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 (file)
index 0000000..6340f0e
--- /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;
+