| Re: [proaudio] Re: media-sound/idjc & media-libs/libshout-idjc version bumps |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Hi Karl,
thanks for your feedback, although I can't find any CRLFs within my
original attached patch (which would be strange anyway, as I've created
the patch on Linux with "svn diff" and edited the ebuilds using VIM)
Also "grep -l $'\r' media-sound_idjc_0.8.14_version_bump.diff" doesn't
find anything...
Anyway, I've changed the dependencies, so that they appear in
alphabetical order and created a new patch against the current svn trunk
(revision 2890), which I was able to apply successfully afterwards.
Regards,
Christian
On 03.07.2014 17:16, Karl Lindén wrote:
Hi!
You have CRLF line terminators in your diff file. I tried running it
through dos2unix, but the resulting patch fails to apply properly.
Please use ordinary unix line terminators.
Oh, this is nitpicking, but the dependencies should probably be
alphabetically ordered. Although they were not properly sorted before,
you can sort them while at it (mutagen goes after libshout-idjs, for
example).
Regards,
Karl
2014-07-01 10:22 GMT+02:00 Christian Affolter
<c.affolter@xxxxxxxxxxxxxxxxx <mailto:c.affolter@xxxxxxxxxxxxxxxxx>>:
Hi all,
any news on this? Would you like me to send the patch in a different
format or split it into separate files?
Thanks
Christian
On 15.06.2014 22:32, Christian Affolter wrote:
Dear proaudio overlay devs,
please find attached a patch which bumps media-sound/idjc to version
0.8.14 including its dependency media-libs/libshout-idjc to 2.3..1.
Additionally, I've added some rather small enhancements within
the idjc
0.8.14 and live (9999) ebuild:
* Add mysql-python dependency for Prokyon 3 or Ampache database
support
* Depend on newer media-sound/jack-audio-__connection-kit and
media-libs/libshout-idjc according to the upstream build
dependency list.
* Remove unsupported and empty keys from the desktop entry file
* Inform the user to configure and start the jack daemon.
Regards
Christian
Index: media-libs/libshout-idjc/ChangeLog
===================================================================
--- media-libs/libshout-idjc/ChangeLog (revision 2890)
+++ media-libs/libshout-idjc/ChangeLog (working copy)
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libshout-idjc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libshout-idjc-2.3.1 (15 Jun 2014)
+
+ 15 Jun 2014; Christian Affolter <c.affolter@xxxxxxxxxxxxxxxxx>
+ +libshout-idjc-2.3.1.ebuild:
+ Version bump and installation of documentation files.
+
04 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx> initial commit:
libshout-idjc-2.3.0.ebuild from Jannis Achstetter
Index: media-libs/libshout-idjc/Manifest
===================================================================
--- media-libs/libshout-idjc/Manifest (revision 2890)
+++ media-libs/libshout-idjc/Manifest (working copy)
@@ -1,4 +1,6 @@
DIST libshout-idjc-2.3.0.tar.gz 447738 SHA256 14b9a00c96ba64e6d35b609f30570bbb850ab94df7a61c3da875e6e71d19fbbe SHA512 1a9199baa70f85607120b6c9fd8405e7560b2e30e5d6919df1d13b40a80acd467d056a3bc18872d75894cd0d4b3931148a08d8309443a57498fed63de4ed714e WHIRLPOOL 4bf86b3ec8b2235dbf3e3551723e176de63ec1662c7fa0289733f30e96b83a2e2d2ee55dce3eb0b74afbfed7e7c57a6c133357d726adb23be2c710cba12e1e33
+DIST libshout-idjc-2.3.1.tar.gz 454846 SHA256 188bed3389c43effc7427b68934f70977ce6eb505281a92d31a22deeae26ac47 SHA512 eede0567b99ec942060261f3ad04ab02d6b9f41d4a39ef8a740ba0a898afbbda5cb9bc0a56abb4dd26bd270c20d546ec3b06b67be907bd8f87c3aef2a5048a9b WHIRLPOOL 96d5c558c3bddbd7635ac6303b0ffe8c8f843e3c8adb57bc416015922b15147269b48b4c2a29ab544b7be9954c6c4079f3d5e02eb5b50e0b6548e937362674d6
EBUILD libshout-idjc-2.3.0.ebuild 738 SHA256 b429c0a9c90d91b415fc6df6e0fc3191eb8dd1e688cf25787f32404285c9417f SHA512 b56d9ef4367ac8bb09de358431f1a7f2b8709d5767165c357218420d274da9ba2fa10075b67ad7aacf83788bff100c5589b1fd67762ccdd73c91f2bf9728e05f WHIRLPOOL 50227b7921a25e742ed3871685bc2cc317c36a1a826ed260f9053b5e479cd01802ba78d68d3c77bf049bb05272eba46739ce98f95b529b48655c7284aa7c1c5c
-MISC ChangeLog 261 SHA256 78810194d1001d70cc67b6eb35e92dd852782c2f788e4ccabcb1b6f0f2b39e2c SHA512 814b6350b0f733324bc57e9358d554e046316d31222117168be215661b8e33bfcf5ec6b40f21b4ecace1e765a012deb20cb993e862d86c50932cfb451f26ecd1 WHIRLPOOL 84eb8c161998c5ccc470e010d670b261481e93c8739897168339e554f332ae0cb1bc5722138ddfc354ce49bc0e041dabe7fa85a50e69c3f03cacdb9b908fd310
+EBUILD libshout-idjc-2.3.1.ebuild 757 SHA256 3c0d47bfc8cfd9f9ef7531bced65786d2a0048ae15eaf5ad3bce5c80e3f9b926 SHA512 ff78d46b20c4a0ee6213fbba4260381ff67a81911c494e643a328fa11c04730309c07c537dabf93861e38b5b3f9101350dcf071437f1a010d311d2dc76d4de60 WHIRLPOOL a4d0cef0da95ea08c000d910c24d3722d174b2ffd6fc187363e21287411778796b7c505b4f929ca53b764157baf053f8b891d0a3f946c0d57dbf5e28ff8ccd39
+MISC ChangeLog 450 SHA256 1c3e2f1341cc6473432403b6c25224a39db7fb54c96efdbebff66c6bfda71356 SHA512 986b3b71e6b0d3e861130bfa690ba6b8a90d4fc0c285e190a1744ec2381d5c30a434fe12c7b3b892a285d02ce281ebda614d2ed7e2f7d4cbf82b7b4feba22ab7 WHIRLPOOL b24a430609aa0be23bd464cf6bbec1d1df77b94fbf113e025283eb134c11e88cbfbf2268af7937be761b42fee618c34f5953f6d739db79bfcccab19f983541f7
MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a
Index: media-libs/libshout-idjc/libshout-idjc-2.3.1.ebuild
===================================================================
--- media-libs/libshout-idjc/libshout-idjc-2.3.1.ebuild (revision 0)
+++ media-libs/libshout-idjc/libshout-idjc-2.3.1.ebuild (working copy)
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Libshout-idjc is libshout plus some extensions for IDJC"
+HOMEPAGE="http://sourceforge.net/projects/idjc/files/libshout-idjc/";
+RESTRICT="mirror"
+SRC_URI="mirror://sourceforge/idjc/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="speex static-libs"
+
+RDEPEND="media-libs/libogg
+ media-libs/libvorbis
+ speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable speex)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -rf "${ED}"/usr/share/doc/${PN}
+ prune_libtool_files
+ dodoc NEWS README
+}
Index: media-sound/idjc/ChangeLog
===================================================================
--- media-sound/idjc/ChangeLog (revision 2890)
+++ media-sound/idjc/ChangeLog (working copy)
@@ -1,7 +1,19 @@
# ChangeLog for media-sound/idjc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*idjc-0.8.14 (04 Jul 2014)
+
+ 15 Jun 2014; Christian Affolter <c.affolter@xxxxxxxxxxxxxxxxx>
+ +idjc-0.8.14.ebuild, idjc-9999.ebuild:
+ Version bump to 0.8.14.
+ Add mysql-python dependency for Prokyon 3 or Ampache database support.
+ Depend on newer media-sound/jack-audio-connection-kit and
+ media-libs/libshout-idjc according to upstream build dependency list.
+ Remove unsupported and empty keys from the desktop entry file.
+ Inform the user to configure and start the jack daemon.
+ Alphabetically ordered the dependencies.
+
*idjc-0.8.9 (02 Jun 2013)
02 Jun 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
Index: media-sound/idjc/Manifest
===================================================================
--- media-sound/idjc/Manifest (revision 2890)
+++ media-sound/idjc/Manifest (working copy)
@@ -1,7 +1,9 @@
+DIST idjc-0.8.14.tar.gz 2613611 SHA256 2cc6932f2029dd6d59780b76b29d9d7d63fdb5338ce07d99b3878f9aae7de1bc SHA512 192db2b9f43980647d9cdb68f6c006601fecd30099507c8a37a751157ed1ba02ceefd994101accefaad18da6344fb0e097662812d6760aa046f669e9c5e57b6f WHIRLPOOL cc7246d256b9879c3d2a26bd52e88197ea8064065d12ce9c5fd1e5883fdb12ce303d0c72c69b884a557daa5821624bc4ca21484590e57c95f2f81b7bb1697a34
DIST idjc-0.8.8.tar.gz 2394140 SHA256 6f27271b2d918747c4caa0d19570173c9866e19c3db076b0974a161adf86ad6c SHA512 350ac339d1646ec5f2e1ea2e58f01cd7ec85e85928dfa1efeb6f7446e9fc4c563ab4c272efd3617bc08b765a3b13b762fe64b024106128cb1653377e73d458db WHIRLPOOL 350a8e75957de5a555424981606677234b8bdfe5c99a32bb6b01180bf748c2831a887bba1916c0332a2970d5e4dedd0b9c175de5a82d57763557615e6c98a6fb
DIST idjc-0.8.9.tar.gz 2431086 SHA256 b74e9a8378b951492c35ea9c2e3e665c5dd79f94958168d4ca872592ab326e71 SHA512 8c24c7f974f0673483fb5e92ff4b0bdff168828fc4fbaa933b056fd505ea2503bdb1d8b94f934545e3f2a969d717ac68ae730cbb47fe8d6ce4c40f3db86a5ef7 WHIRLPOOL 9147d5010f6d75bdd05c2b9c2ceb0c31872b950ba0812c4bd43c41d7c1137c2918cc793e4f0c1d29666a8dc5ef33c9738586a0a611641ac8eb5d0d78b66069cc
+EBUILD idjc-0.8.14.ebuild 1847 SHA256 8e723828563262b752b8818a9a9c33aac51da64b0205c164496ce7358a87e037 SHA512 c96c8d1184fd3f37bc28c1dba8ddf33887af1f1aee50091a77ab4d8b0a767f9adf8fbb8fb7a79c0062f02393311c1fd971fdb27ee4d4c3db0830ede1b05aab16 WHIRLPOOL be5925c79156c6b408f89965af2e1dd8d83054363da8c94c609faba4847f333c36a2a6e1760346bf3fd6e76ac0ce836974c5da4bf5bc9b41b4dbf370be03db2a
EBUILD idjc-0.8.8.ebuild 1315 SHA256 70eb170e956d01fdbeb92a354518699da92a142de551ccb4273eff341d4602fd SHA512 b9b93b65bfe07ee8c3cc9f77752347a3494f0a2a7e295613aec6fe77dfeb1c51b1bf5d103b03a2fd8f68819b12bae60b004578161ffc034e065ae9494c59293b WHIRLPOOL e9d026797eaef188b7d57f09614419f07b8e8595757d6da5f4ca760a2c7b10a421833a9e69d00d62ac4c29db0aacc145aba8d29247880cbc7e66a2695d704e6e
EBUILD idjc-0.8.9.ebuild 1395 SHA256 a9d69bd72bf124507474fcb9aa853a51b57ab303f73a802cd8aee38d62dc13bc SHA512 a1e7fd43bd12444fec2989bcb258ec7b34d0ddd579083209de109a70d13bcae1687cf4fb838077820c3562441925eea4de8811f99d87ac324a8cdf76f18b80fb WHIRLPOOL 7e84decb7e3176e445195b25255f9938dd8c49f2ef672f08ca20f131c4cb47727172f33ce53fb98db7b9a663392141d14763b6f8330ade4fe696cc4dd9fea45c
-EBUILD idjc-9999.ebuild 1531 SHA256 920a974c7db8cbc9d4c60ce202dcb1306179d07340b7fc9d643c42f4332eb296 SHA512 22b6cc85bf758ca6f707089ce36b8808b57f398dc0f1cd18ceb1356b3da5d1535c152894a0e3b1623a24bc217939cbafc73d3f86598e1035ad6e7225fb9dc94c WHIRLPOOL bf2863953a8804d6f73f837902a732e216ddbd6ea0bd2a35afe23f6fbf5374d9d1f954b6443437131a6ea18a75dd14eaabd3fa7c19233f6a6bffdee0f04cf6c2
-MISC ChangeLog 1739 SHA256 3025bc0d1e2a17a8a884dbadf0c84da456788e45ab1ea08708e2f4f21872cde6 SHA512 5438c46de1f8a75ad608efa2a476c44f918d94c6875f45eded7eba6054479166675981e13e2e961e757d05bfbc08765db49fbdf2052ac35813ef3e3892c44659 WHIRLPOOL e24a13db40316a3b5642995173e3f547e79945dd437d34c7b0ffe5ae626f80af342e7ca158fd58f72aa8c77cb76267063d576cc98c4799acf1d34a0b7c7e59c6
+EBUILD idjc-9999.ebuild 1991 SHA256 62a4ba7e9448a11a7c0283e0bf5b769268c0d050bf9c0eda3af5b54bc07757b6 SHA512 674e4cf68f33f619a8a5be53c6043fd3b1ddaf23a387fbb2f3b2b960d1854d947bdcb8a6fff5d8ecefbdc78aa518ed350ada43bb9a38c6bc600f29d2b0475e2b WHIRLPOOL 935f9bf6987fb796bbdc24003dc501de7f192a920b613e3e3e4d1fe7fb5f336ad10b54f65a6b34ef918de6ec821ba40ae7690edc5fd84d529cef980407aa8f5a
+MISC ChangeLog 2271 SHA256 0309b379e692844270c1b36b4ea730151f2144ec23c2411dadc9d561f58ae965 SHA512 79d0ec80489e60b483945b36b8f1becf8a3fe9753c3647c94ac12ee53f77f8d6bcb8dcb28b6e035b98d6a4c6274bfbcb2306b01acb88bacf33b229c19eacdf79 WHIRLPOOL 40ed48a9f728ce9e80a4588cfd5ee331f1ea333770908a15e6b3d885a3947a6cd70d1b95cae51b5fdf1c9eca0b199a37dfe3848de38376c202dbb80540746884
MISC metadata.xml 567 SHA256 e8e1bca17a2800bd24342eb9bf03618bbb9b0d720c702795780161a4e32e292a SHA512 dc07c4a70d19595a850b171b8269ad8423bbdd8cb3581073585887e35b525ad28a1271a0d6f1d6790cccb72bedf3be26ee547906e66c756173074a7d4c306d00 WHIRLPOOL 536e737508d4342d0443b6877a629f840e3fe900cebfb04ba594d3dad037c8fa37f023f7127c748533e118d550275940280f5dd9ab9815f2ada360e798751711
Index: media-sound/idjc/idjc-0.8.14.ebuild
===================================================================
--- media-sound/idjc/idjc-0.8.14.ebuild (revision 0)
+++ media-sound/idjc/idjc-0.8.14.ebuild (working copy)
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils python-single-r1
+
+RESTRICT="mirror"
+DESCRIPTION="Internet DJ Console has two media players, jingles player, crossfader, VoIP and streaming"
+HOMEPAGE="http://idjc.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="doc ffmpeg flac mad mpg123 mysql nls opus speex twolame"
+
+RDEPEND="dev-python/eyeD3[${PYTHON_USEDEP}]
+ dev-python/pygtk[${PYTHON_USEDEP}]
+ ffmpeg? ( virtual/ffmpeg )
+ flac? ( media-libs/flac )
+ mad? ( media-sound/lame )
+ media-libs/libsamplerate
+ >=media-libs/libshout-idjc-2.3.1[speex?]
+ media-libs/libsndfile
+ media-libs/libvorbis
+ media-libs/mutagen[${PYTHON_USEDEP}]
+ >=media-sound/jack-audio-connection-kit-0.116.0
+ mpg123? ( media-sound/mpg123 )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ nls? ( sys-devel/gettext )
+ opus? ( media-libs/opus )
+ speex? ( media-libs/speex )
+ twolame? ( media-sound/twolame )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Make QA happy by removing unsupported and empty keys from the desktop
+ # entry file.
+ sed -i \
+ -e 's/^TerminalOptions=//' \
+ -e 's/^Path=//' \
+ idjc.desktop.in.in || die "Sed failed!"
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ffmpeg libav)
+ $(use_enable flac)
+ $(use_enable mad lame)
+ $(use_enable mpg123)
+ $(use_enable nls)
+ $(use_enable opus)
+ $(use_enable speex)
+ $(use_enable twolame)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doc/ )
+ autotools-utils_src_install
+}
+
+pkg_postinst()
+{
+ einfo "IDJC needs a working JACK Audio Connection Kit daemon. For details,"
+ einfo "refer to http://idjc.sourceforge.net/install_first_run.html";
+}
Index: media-sound/idjc/idjc-9999.ebuild
===================================================================
--- media-sound/idjc/idjc-9999.ebuild (revision 2890)
+++ media-sound/idjc/idjc-9999.ebuild (working copy)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,20 +16,22 @@
SLOT="0"
KEYWORDS=""
-IUSE="doc ffmpeg flac mad mpg123 nls opus speex twolame"
+IUSE="doc ffmpeg flac mad mpg123 mysql nls opus speex twolame"
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.7
- dev-python/eyeD3[${PYTHON_USEDEP}]
+RDEPEND="dev-python/eyeD3[${PYTHON_USEDEP}]
dev-python/pygtk[${PYTHON_USEDEP}]
+ ffmpeg? ( virtual/ffmpeg )
+ flac? ( media-libs/flac )
+ mad? ( media-sound/lame )
media-libs/libsamplerate
+ media-libs/libshout-idjc
+ >=media-libs/libshout-idjc-2.3.1[speex?]
media-libs/libsndfile
media-libs/libvorbis
media-libs/mutagen[${PYTHON_USEDEP}]
- media-libs/libshout-idjc
- ffmpeg? ( virtual/ffmpeg )
- flac? ( media-libs/flac )
- mad? ( media-sound/lame )
+ >=media-sound/jack-audio-connection-kit-0.116.0
mpg123? ( media-sound/mpg123 )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
nls? ( sys-devel/gettext )
opus? ( media-libs/opus )
speex? ( media-libs/speex )
@@ -38,6 +40,13 @@
virtual/pkgconfig"
src_prepare() {
+ # Make QA happy by removing unsupported and empty keys from the desktop
+ # entry file.
+ sed -i \
+ -e 's/^TerminalOptions=//' \
+ -e 's/^Path=//' \
+ idjc.desktop.in.in || die "Sed failed!"
+
pushd "${S}/docsrc"
emake && emake doc
popd
@@ -64,3 +73,9 @@
autotools-utils_src_install
}
+
+pkg_postinst()
+{
+ einfo "IDJC needs a working JACK Audio Connection Kit daemon. For details,"
+ einfo "refer to http://idjc.sourceforge.net/install_first_run.html";
+}