| [proaudio] [1211] jackdmp is now a useflag of jack-audio-connection-kit, and drop-in replaces it. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1211
Author: gimpel
Date: 2008-05-03 11:50:09 +0200 (Sat, 03 May 2008)
Log Message:
-----------
jackdmp is now a useflag of jack-audio-connection-kit, and drop-in replaces it.
So, to install jackdmp, install jack-audio-connection-kit with USE="jackdmp"
This counts for the -9999 live ebuilds only!
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
trunk/overlays/proaudio/media-sound/jackdmp/Manifest
trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2008-05-03 08:52:38 UTC (rev 1210)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2008-05-03 09:50:09 UTC (rev 1211)
@@ -19,6 +19,6 @@
EBUILD jack-audio-connection-kit-0.103.0.ebuild 4016 RMD160 e8e807988fb0ecc419ed51bedbcad17a51d43e13 SHA1 d625e691c61ea1e849d0c8dbe2c768324bc529d0 SHA256 8786bc424e9ffe2e2f6d7a7af9ee86e267a05c4b74364b28a483268e7bb69456
EBUILD jack-audio-connection-kit-0.109.0.ebuild 4381 RMD160 b2d95df3ef485a113825770644646eb46d318456 SHA1 67e22a333e70046b2292a207f6a824045a936ae6 SHA256 ac7d94848ac2d3c84e2159096ba7b0a3044a93157ad5089b67cc4d0a9a37b0b2
EBUILD jack-audio-connection-kit-0.109.2.ebuild 4350 RMD160 57d796dea6c3de68733dda6743cfc71ef582e79a SHA1 ec336ca357d312ec06ba0bafa031fcfc60eda12f SHA256 469ed13600d80b9155b9a72f18261a73ca4a44db5fcb3901fd164b658e7d3e6f
-EBUILD jack-audio-connection-kit-9999.ebuild 4131 RMD160 6201bbba0e69794f6540e257714ef8b598e24ce8 SHA1 cdf58a70f3f04e2c17071c9773ad61dc57626491 SHA256 04ab4a30b549dd9eecd956e9d2be4ee86d9487def56381aebfcc88b704de69ca
+EBUILD jack-audio-connection-kit-9999.ebuild 4206 RMD160 c82e33919b896a2318f81bb5ba75c9e1c84b02bd SHA1 d15633d19085a14a75fd7d3c5c2a6eb57a5a4b02 SHA256 f6babddc2d2f4b9e02789ebc7338f59b59d8fbce01ea0310a78887087a347c66
MISC ChangeLog 2696 RMD160 0428981e9ff843ec8aed2418dddc512317fa02d9 SHA1 2266929e2c25859355d946c602e061de514c810b SHA256 e4c613fdb4db033616bf254cf8f2629202bd42d2a6213d78674dc151a9865a60
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild 2008-05-03 08:52:38 UTC (rev 1210)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild 2008-05-03 09:50:09 UTC (rev 1211)
@@ -10,8 +10,8 @@
RESTRICT="nostrip nomirror"
DESCRIPTION="A low-latency audio server"
HOMEPAGE="http://www.jackaudio.org";
-#SRC_URI="netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
-SRC_URI="dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 )"
+SRC_URI="
+!jackdmp? ( dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 ) )"
ESVN_REPO_URI="http://subversion.jackaudio.org/jack/trunk/jack";
@@ -19,151 +19,150 @@
SLOT="0"
KEYWORDS=""
IUSE="3dnow altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss sndfile sse
-jackmidi freebob dbus"
+jackmidi freebob dbus jackdmp"
-RDEPEND="dev-util/pkgconfig
+RDEPEND="jackdmp? ( >=media-sound/jackdmp-9999-r1 )
+ !jackdmp? ( dev-util/pkgconfig
netjack? ( !media-sound/netjack )
sndfile? ( >=media-libs/libsndfile-1.0.0 )
sys-libs/ncurses
caps? ( sys-libs/libcap )
alsa? ( >=media-libs/alsa-lib-0.9.1 )
jackmidi? ( media-libs/alsa-lib )
- freebob? ( sys-libs/libfreebob )
- !media-sound/jack-audio-connection-kit-svn"
+ freebob? ( sys-libs/libfreebob ) )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
pkg_setup() {
- if ! use sndfile ; then
- ewarn "sndfile not in USE flags. jack_rec will not be installed!"
- fi
+ if use jackdmp; then
+ ewarn "You have enabled the jackdmp useflag. This ebuild will just pull"
+ ewarn "in jackdmp and will NOT compile and install ${PN}!"
+ sleep 3
+ else
- if use caps; then
- if [[ "${KV:0:3}" == "2.4" ]]; then
- einfo "will build jackstart for 2.4 kernel"
- else
- einfo "using compatibility symlink for jackstart"
+ if ! use sndfile; then
+ ewarn "sndfile not in USE flags. jack_rec will not be installed!"
fi
- fi
+ if use caps; then
+ if [[ "${KV:0:3}" == "2.4" ]]; then
+ einfo "will build jackstart for 2.4 kernel"
+ else
+ einfo "using compatibility symlink for jackstart"
+ fi
+ fi
+
+ fi
}
src_unpack() {
- subversion_src_unpack
-# use netjack && cd ${WORKDIR} && unpack ${NETJACK}.tar.bz2
- use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
- cd ${S}
+ if use jackdmp; then
+ einfo "You requested to install jackdmp. Nothing to do"
+ else
+ subversion_src_unpack
+ use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
+ cd ${S}
-# epatch ${FILESDIR}/${PN}-transport.patch
+ #epatch ${FILESDIR}/${PN}-transport.patch
- # jack transport patch from Torben Hohn
- epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
+ # jack transport patch from Torben Hohn
+ epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
- # dbus patches from Nedko Arnaudov
- if use dbus; then
- epatch "../${JACKDBUS}/dbus.patch"
- epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
+ # dbus patches from Nedko Arnaudov
+ if use dbus; then
+ epatch "../${JACKDBUS}/dbus.patch"
+ epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
+ fi
+ sed -i -e "s:include/nptl/:include/:g" configure.ac || die
+ eautoreconf
+ sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure || die
fi
- sed -i -e "s:include/nptl/:include/:g" configure.ac || die
- eautoreconf
- sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure || die
}
src_compile() {
- local myconf
-
- use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
- if use jack-tmpfs; then
- myconf="${myconf} --with-default-tmpdir=/dev/shm"
+ if use jackdmp; then
+ einfo "You requested to install jackdmp. Nothing to do"
else
- myconf="${myconf} --with-default-tmpdir=/var/run/jack"
- fi
+ local myconf
- if use dbus; then
- myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
- fi
+ use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
- if use userland_Darwin ; then
- append-flags -fno-common
- use altivec && append-flags -force_cpusubtype_ALL \
- -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
- fi
+ if use jack-tmpfs; then
+ myconf="${myconf} --with-default-tmpdir=/dev/shm"
+ else
+ myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+ fi
- use sndfile && \
- export SNDFILE_CFLAGS="-I/usr/include" \
- export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
+ if use dbus; then
+ myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
+ fi
- econf \
- $(use_enable altivec) \
- $(use_enable alsa) \
- $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
- $(use_enable coreaudio) \
- $(use_enable debug) \
- $(use_enable doc html-docs) \
- $(use_enable mmx) \
- $(use_enable oss) \
- $(use_enable sse) \
- $(use_enable 3dnow dynsimd) \
- $(use_enable jackmidi) \
- --disable-portaudio \
- ${myconf} || die "configure failed"
- emake || die "compilation failed"
+ if use userland_Darwin ; then
+ append-flags -fno-common
+ use altivec && append-flags -force_cpusubtype_ALL \
+ -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
+ fi
- if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
- einfo "Building jackstart for 2.4 kernel"
- cd ${S}/jackd
- emake jackstart || die "jackstart build failed."
- fi
+ use sndfile && \
+ export SNDFILE_CFLAGS="-I/usr/include" \
+ export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
- #if use netjack; then
- # cd "${WORKDIR}/${NETJACK}"
- # scons jack_source_dir=${S}
- #fi
+ econf \
+ $(use_enable altivec) \
+ $(use_enable alsa) \
+ $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+ $(use_enable coreaudio) \
+ $(use_enable debug) \
+ $(use_enable doc html-docs) \
+ $(use_enable mmx) \
+ $(use_enable oss) \
+ $(use_enable sse) \
+ $(use_enable 3dnow dynsimd) \
+ $(use_enable jackmidi) \
+ --disable-portaudio \
+ ${myconf} || die "configure failed"
+ emake || die "compilation failed"
+ if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
+ einfo "Building jackstart for 2.4 kernel"
+ cd ${S}/jackd
+ emake jackstart || die "jackstart build failed."
+ fi
+
+ fi
}
src_install() {
- make DESTDIR=${D} datadir=/usr/share/doc install || die
+ if use jackdmp; then
+ einfo "You requested to install jackdmp. Nothing to do"
+ else
+ make DESTDIR=${D} datadir=/usr/share/doc install || die
- if use caps; then
- if [[ "${KV:0:3}" == "2.4" ]]; then
- cd ${S}/jackd
- dobin jackstart
- else
- dosym /usr/bin/jackd /usr/bin/jackstart
+ if use caps; then
+ if [[ "${KV:0:3}" == "2.4" ]]; then
+ cd ${S}/jackd
+ dobin jackstart
+ else
+ dosym /usr/bin/jackd /usr/bin/jackstart
+ fi
fi
- fi
- if ! use jack-tmpfs; then
- keepdir /var/run/jack
- chmod 4777 ${D}/var/run/jack
- fi
+ if ! use jack-tmpfs; then
+ keepdir /var/run/jack
+ chmod 4777 ${D}/var/run/jack
+ fi
- if use doc; then
- mv ${D}/usr/share/doc/${PF}/reference/html \
- ${D}/usr/share/doc/${PF}/
+ if use doc; then
+ mv ${D}/usr/share/doc/${PF}/reference/html \
+ ${D}/usr/share/doc/${PF}/
- insinto /usr/share/doc/${PF}
- doins -r ${S}/example-clients
- else
- rm -rf ${D}/usr/share/doc
- fi
+ insinto /usr/share/doc/${PF}
+ doins -r ${S}/example-clients
+ else
+ rm -rf ${D}/usr/share/doc
+ fi
- rm -rf ${D}/usr/share/doc/${PF}/reference
+ rm -rf ${D}/usr/share/doc/${PF}/reference
-# if use netjack; then
-# cd ${WORKDIR}/${NETJACK}
-# dobin alsa_in
-# dobin alsa_out
-# dobin jacknet_client
-#
-# # why on earth doesn't get_libdir work here
-# if use amd64; then
-# insinto /usr/lib64/jack
-# else
-# insinto /usr/lib/jack
-# fi
-# doins jack_net.so
-# fi
+ fi
}
Modified: trunk/overlays/proaudio/media-sound/jackdmp/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jackdmp/Manifest 2008-05-03 08:52:38 UTC (rev 1210)
+++ trunk/overlays/proaudio/media-sound/jackdmp/Manifest 2008-05-03 09:50:09 UTC (rev 1211)
@@ -2,7 +2,7 @@
DIST jackdmp_0.69.zip 5136069 RMD160 738029dcc370a488054e4aedce85c295594a6848 SHA1 c1da0ae8c0e0e9fd5861e65718d89598770e1b7b SHA256 9cbaf0fea295a29680ede459537e9423f8abf70512d5cda989a52f52abd92700
EBUILD jackdmp-0.68.ebuild 2475 RMD160 66c9fba58fae30e38b49566aef528fd8e52de95c SHA1 0d7828ab8f42d4319ed0faeffdf4d76d169aa3a0 SHA256 ec6c3a4c6772adeb16e7ae59626a76a06cd0417f858e1bbc2c028029c600c879
EBUILD jackdmp-0.69.ebuild 2475 RMD160 66c9fba58fae30e38b49566aef528fd8e52de95c SHA1 0d7828ab8f42d4319ed0faeffdf4d76d169aa3a0 SHA256 ec6c3a4c6772adeb16e7ae59626a76a06cd0417f858e1bbc2c028029c600c879
-EBUILD jackdmp-9999-r1.ebuild 2180 RMD160 98a8db5d72aa542ca5a868394c4db90814b7bb82 SHA1 e5d9eec8c52b00fd43b07de68d17a063623decbf SHA256 c7bc93f52952f8eb56122ff92822fe96cdd0aba8b48206de60028f2f0392a2a2
+EBUILD jackdmp-9999-r1.ebuild 1055 RMD160 4f09519f0ef0ac2adc63813de72b6c8be4cb54d2 SHA1 58d797f172112053928f88f1f1a2b6e10eb179e1 SHA256 8a1885dcca973459ecbc79af1939090712c47f3b86d8fb2532b4af958bd76c37
EBUILD jackdmp-9999.ebuild 3396 RMD160 5013781cfaa4282ec099ee6574e518dcda238a82 SHA1 b44080c927c279ddd7fd80704a5fc6b458a1db9b SHA256 e2376acbe84cfddb31e018cec707048780c2073810a1ce819bd9e48fc5454de6
MISC ChangeLog 399 RMD160 ff69dfe73496a55d87ee6804011511a773deb8dd SHA1 e683eeee9136b7a0dd72d87d1082b1b9bb1b1cb1 SHA256 8d548cb3ab28decf1c450501e3d9a87eef9ebd321b1b2ba1e495cc7b3760c120
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified: trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild 2008-05-03 08:52:38 UTC (rev 1210)
+++ trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild 2008-05-03 09:50:09 UTC (rev 1211)
@@ -17,7 +17,8 @@
RDEPEND="dev-util/pkgconfig
>=media-libs/alsa-lib-0.9.1
- freebob? ( sys-libs/libfreebob )"
+ freebob? ( sys-libs/libfreebob )
+ !<media-sound/jack-audio-connection-kit-9999"
DEPEND="${RDEPEND}
app-arch/unzip
@@ -34,42 +35,6 @@
}
src_install() {
- cd linux/
- dodir /usr/bin /usr/lib/jackmp
- make DESTDIR="${D}" datadir=/usr/share/doc install || die
- cd ${S}
-
- dosym /usr/lib/libjackmp.so /usr/lib/libjack.so
- dosym /usr/lib/libjackmp.so /usr/lib/libjack.so.0
-
+ scons PREFIX="${D}/usr" install || die
dodoc Readme Todo ChangeLog
}
-
-pkg_postinst() {
- local provided="${ROOT}/etc/portage/profile/package.provided"
-
- test -d ${ROOT}/etc/portage/profile \
- || dodir /etc/portage/profile
-
- if [ -z `grep "media-sound/jack-audio-connection-kit-0.109.0" ${provided}` ]
- then
- elog "Adding media-sound/jack-audio-connection-kit to"
- elog "/etc/portage/profile/package.provided ..."
- elog "Note that a lot of things might not compile correctly"
- elog "against jackdmp's jack headers!"
-
- echo "media-sound/jack-audio-connection-kit-0.109.0" >> ${provided}
- fi
-}
-
-pkg_postrm() {
- # gets removed too when upgrading jackdmp, so let the user do it!
- elog "*************** IMPORTANT ******************"
- elog "PLEASE remove media-sound/jack-audio-connection-kit from"
- elog "/etc/portage/profile/package.provided"
- elog "if you switch to jack-audio-connection-kit again!!"
- elog "Otherwhise you will mess up dependencies!"
-
- #sed '/media-sound\/jack-audio-connection-kit-0.109.0/d' \
- # -i ${ROOT}/etc/portage/profile/package.provided
-}