| [proaudio] [1596] bpmdj version bump & cleanup |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1596
Author: gentoid
Date: 2010-04-01 00:41:28 +0200 (Thu, 01 Apr 2010)
Log Message:
-----------
bpmdj version bump & cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/bpmdj/ChangeLog
trunk/overlays/proaudio/media-sound/bpmdj/Manifest
trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.6.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-4.1.ebuild
trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3-defines.gentoo
trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3.6-include.patch
trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-4-defines.gentoo
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-2.9.ebuild
trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.2.ebuild
trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-destdir.patch
trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-make_install.patch
trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-nostrip.patch
trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-prefix.patch
trunk/overlays/proaudio/media-sound/bpmdj/files/defines.gentoo
Modified: trunk/overlays/proaudio/media-sound/bpmdj/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/ChangeLog 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/ChangeLog 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,7 +1,18 @@
# ChangeLog for media-sound/bpmdj
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bpmdj-4.1 (31 Mar 2010)
+
+ 31 Mar 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> -bpmdj-2.9.ebuild,
+ -bpmdj-3.2.ebuild, bpmdj-3.6.ebuild, +files/bpmdj-3.6-include.patch,
+ +files/bpmdj-3-defines.gentoo, +bpmdj-4.1.ebuild,
+ +files/bpmdj-4-defines.gentoo, -files/Makefile-destdir.patch,
+ -files/Makefile-make_install.patch, -files/Makefile-nostrip.patch,
+ -files/Makefile-prefix.patch, -files/defines.gentoo:
+ Version bump. Corrected defines. Fix include in bpmdj-3.6.
+ Remove old ebuilds, patches & define
+
06 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>; bpmdj-3.6.ebuild:
fixed qt4_min... QA msg
Modified: trunk/overlays/proaudio/media-sound/bpmdj/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/Manifest 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/Manifest 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,15 +1,11 @@
-AUX Makefile-destdir.patch 1447 RMD160 03576df56c8c6cc8ee8c73336e37cc9e21741a35 SHA1 0a56290f7e8c598b969f835681000ff4662e8b61 SHA256 5e3d935d7be6ca3eb0bfec903c50ff8b031ccc558786ed35a3b4d43c84362c22
-AUX Makefile-make_install.patch 923 RMD160 1568925d58e35c6fe9d3bc3a1e2861bd1e34a843 SHA1 d86e7d53beb460753bd1dafdbc4a98583b653883 SHA256 cba1b7d690d8c280039656cb02710944cf388125f7b25edda761430f1d6e1a7d
-AUX Makefile-nostrip.patch 380 RMD160 674f680fdb060988e9bb973656dd61e54643c8cd SHA1 95b504d86eebd73025b27fc57709405312e09512 SHA256 b5665f0217c2047012234ea7b22d8d3284943ed7d3fb3992261aa67abd8b104e
-AUX Makefile-prefix.patch 273 RMD160 997186e1bb88ed34bbb4d6ef1ec6a34bb5f571c0 SHA1 469b18fa9405713b03c8acbba7a74f08b5507f46 SHA256 ca18506af6cc37d36f7b75d9b8290deca5a2ab34dfe3468d6f8b78b366c0d71f
+AUX bpmdj-3-defines.gentoo 337 RMD160 2c959a709b68431a103464ff74b4d58cf518d380 SHA1 0e146640f05ef9c19ba56db5ef57a0f275c687a1 SHA256 f9037cbf21f1a15541addd1a4562c249f54f3d1cda29a047df080964c03422ca
+AUX bpmdj-3.6-include.patch 241 RMD160 16b062532e552e5a4905abd641f1fd4fa66ee5b2 SHA1 5914b7acb631d093871d75fa8bbf2f8a8e424d50 SHA256 424d235c0c65518de5422b97e3372d3d1e318f081cea2aedc0e262c467ab3ec5
+AUX bpmdj-4-defines.gentoo 324 RMD160 83a034478d95fbba5fe61c28b6988e271208bf02 SHA1 54a894b0a958e52b546cddaeeac0362d309a23f1 SHA256 2dfb58dae6b7819ad8739fdca924274baf11d9da4794187aa51c90f6a0035133
AUX bpmdj.png 18328 RMD160 0fdd026334ff20a143e531f883d2f8fffe806715 SHA1 1074527bde98b92eb7743cbcff148c144ced47bc SHA256 fdc2e96f33eb42728c2d928631399c9deaadbcfc2b43634d2eec3f12afef3db7
AUX bpmdj.sh 414 RMD160 1540bebb2a5a2191cabb8a278240e978b327ca49 SHA1 f469ae408e548a6aaf83dcd1954cee6f7c7fdbb6 SHA256 929b67c9602bbec3b876357cf3f854fd4bd7376bee78b90ccd1dd5d5eb6480be
-AUX defines.gentoo 342 RMD160 55b1bf619e116feea3a89d8d9105369f0c010233 SHA1 7a7864628270628d1c014fcf47310535340fde77 SHA256 33f3bd233572ef2be2c3e3c8a835d30c790975b18ee8c1e829f452b9efa0eceb
-DIST bpmdj-2.9.source.tgz 449045 RMD160 228649fe141c2d45bfd9f818ffc2d2aede9959ec SHA1 6862e3cfafe093e53279696df9771ef93e3397c8 SHA256 b7375c248733f8d0630c629ce118fd9f74d6c95681ac18e22b3ebc06a2ecf856
-DIST bpmdj-3.2.source.tgz 949401 RMD160 13c02a0daa94dd4827ff1d53c95691ccdf3ddc9a SHA1 7fe8056c97c504bcf5147008fdb28a360260b781 SHA256 3866cc0ea31160bc5cfea9b32c20cf826f050a0c959d42e661d4ed02948ee10f
DIST bpmdj-3.6.source.tgz 539603 RMD160 410f1954875e9e6ecf9a19551df284b778436d72 SHA1 196b69457fe757d20d43b20aed2b08ae1365d845 SHA256 539197f531f185e1e5b5242db983a1b0839ce8f66b8fa5ac46542ef8f28929b3
-EBUILD bpmdj-2.9.ebuild 2804 RMD160 71f733fb673a22eb3bcbfb596f3c86efe25d8265 SHA1 32738da2cb145552251f5c5a9db71f257ce16760 SHA256 0d3bea45cd8bb6ddea5ee2cee4e55b74b8f19dd32387bcaeee3a89c78ca83f94
-EBUILD bpmdj-3.2.ebuild 3162 RMD160 0890bcc332340f58cad53e7d90fbbf896eb640d1 SHA1 a2542a343cc3f30332b4b499b1fd01c5fb91f50a SHA256 a6873d451c04d68dbdee519e43163a721c06b046238d289e49fc08a40c4c09a6
-EBUILD bpmdj-3.6.ebuild 2005 RMD160 5e5c458dbeebe86ffdd8a6b4ca0b2fbc992f1405 SHA1 6d88a2b52f09961cc443ecdc94fd6d1097ed3cbb SHA256 7a1951d8b2d941bf02f73edebd25f8fc39240b64930d0f41e9346fedd1c5b194
-MISC ChangeLog 308 RMD160 25442d841902a8c8a2f680923e854a4e5d145f02 SHA1 e8645135aa686b1f1ff4bde920acee97be16b015 SHA256 f851899f64fbfceff40ef06bf1b913a39907f4208135dd734cd78ca9fb333563
+DIST bpmdj-4.1.source.tgz 786420 RMD160 0389cc3b53bd75d04c49f789e5b49b68c24ffe73 SHA1 8928490bc798e72286711562b8b2656f5038c8c5 SHA256 fb43c8dfb5988d5b980b890d762b463721a1d7f5ac13d9e1221e43c4fee1c2b3
+EBUILD bpmdj-3.6.ebuild 2041 RMD160 10bdaf6825a55c3d83a1268cd760361dc33f0ff6 SHA1 35832fb26ba323d1d0c7907bb48a83afa80d3074 SHA256 eb564da722f8a40be45e1d85b3fd3699d27019c140f9f212cd41f966cc7472ae
+EBUILD bpmdj-4.1.ebuild 2044 RMD160 3f8d133a51b9f42b61fb3c048dae33cd99ecfec9 SHA1 c017d3b98ebb4a3e934b00e9a62ab6eb9a43d6bc SHA256 e6afebc9f78bdd1647febdfb1517f8c73887bad14c5f793e7a3bf0153f0a670c
+MISC ChangeLog 818 RMD160 2da80cdd94e8ea6a3851dd97414394f2518130c4 SHA1 e8ef0e6612fc3536ee0a52f3995ac86d73be2215 SHA256 0417fb7012e940677bd939829caffc7dfffbdc95baa8dc1638f3f3f8e4044bda
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-2.9.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-2.9.ebuild 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-2.9.ebuild 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-IUSE="mp3 vorbis"
-
-inherit eutils toolchain-funcs kde-functions
-need-qt 3
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.source.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-amd64: 2.6-2.7 - kbpm-play: common.cpp:42: void common_init(): Assertion `sizeof(signed4)==4' failed. - eradicator
-KEYWORDS="-amd64 x86 ~ppc"
-
-DEPEND="=x11-libs/qt-3*"
-
-RDEPEND="${DEPEND}
- mp3? ( dev-perl/MP3-Tag )
- vorbis? ( media-sound/vorbis-tools )
- media-sound/alsamixergui
- virtual/mpg123
- >=sci-libs/fftw-3"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- # qt utils path
- sed -i -e "s:^UIC.*:UIC = \${QTDIR}/bin/uic:" defines.gentoo || \
- die "changing uic-dir failed"
- sed -i -e "s:^MOC.*:MOC = \${QTDIR}/bin/moc:" defines.gentoo || \
- die "changing moc-dir failed"
-
- # DEFINE FIX
- sed -i -e "s:^\(CFLAGS.*\):\1 -D QT_THREAD_SUPPORT:" defines.gentoo || \
- die "ADD QT_THREAD_SUPPORT failed"
-
- # gcc4.1 fixes
- sed -i -e "s|MixerDialogLogic::||g" mixerdialog.logic.h || \
- die "failed to apply gcc4.1 fix to mixerdialog.logic.h"
- sed -i -e "s|PreferencesLogic::||g" preferences.logic.h || \
- die "failed to apply gcc4.1 fix to preferences.logic.h"
- sed -i -e "s|QSong::||" qsong.h || \
- die "failed to apply gcc4.1 fix to qsong.h"
- sed -i -e "36,37s|SongWithDistance::||" heap.cpp || \
- die "failed to apply gcc4.1 fix to heap.cpp"
- sed -i -e "s|SongPlayerLogic::||g" songplayer.logic.h || \
- die "failed to apply gcc4.1 fix to songplayer.logic.h"
-
- # fix Makefile
- epatch "${FILESDIR}/Makefile-prefix.patch"
- epatch "${FILESDIR}/Makefile-make_install.patch"
- epatch "${FILESDIR}/Makefile-nostrip.patch"
-
- sed -i -e "s:^PREFIX.*:PREFIX = /usr:" makefile || \
- die "changing makefile failed"
- #verbose makefile
- sed -i -e 's:^\t@:\t:g' makefile
-}
-
-src_compile() {
- addwrite "${QTDIR}/etc/settings"
-
- cp defines.gentoo defines
- make ${MAKEOPTS} CPP=$(tc-getCXX) CC=$(tc-getCC) VARTEXFONTS=${T}/fonts LDFLAGS="${LDFLAGS} `pkg-config --libs fftw3` `pkg-config --libs alsa` -lrt" || die "make failed"
-}
-
-src_install () {
-# make is broken (installs into /bpmdj)
- make DESTDIR="${D}" install || die "make install failed"
-# mv ${D}/usr/share/doc/{${PN},${PF}}
-
- exeinto /usr/bin
- #doexe alsamixerguis bpmdj-raw bpmdj-record bpmdj-replay copydirstruct fetchdirstruct fetchfiles kbpm-batch kbpm-dj kbpm-merge kbpm-mix kbpm-play rbpm-play record_mixer xmms-play || die "doexe failed"
- use mp3 && doexe bpmdj-import-mp3.pl
- use vorbis && doexe bpmdj-import-ogg.pl
- dodoc authors changelog copyright readme todo
- #mkdir -p ${D}/usr/share/bpmdj
- #cp -pPR sequences ${D}/usr/share/bpmdj/ || die "cp failed"
-}
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.2.ebuild 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.2.ebuild 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-IUSE="mp3 vorbis"
-
-inherit eutils toolchain-funcs kde-functions
-need-qt 3
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.source.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-amd64: 2.6-2.7 - kbpm-play: common.cpp:42: void common_init(): Assertion `sizeof(signed4)==4' failed. - eradicator
-KEYWORDS="-amd64 x86 ~ppc"
-
-DEPEND="${RDEPEND}
- =x11-libs/qt-3*
- dev-util/pkgconfig"
-
-RDEPEND="mp3? ( dev-perl/MP3-Tag )
- media-libs/alsa-lib
- vorbis? ( media-sound/vorbis-tools )
- || ( media-sound/lame media-sound/bladeenc )
- media-sound/alsamixergui
- virtual/mpg123
- =sci-libs/fftw-3*"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- # ################ defines.gentoo #############
- # qt utils path
- sed -i -e "s:^UIC.*:UIC = \${QTDIR}/bin/uic:" defines.gentoo || \
- die "changing uic-dir failed"
- sed -i -e "s:^MOC.*:MOC = \${QTDIR}/bin/moc:" defines.gentoo || \
- die "changing moc-dir failed"
- # set qt3 include dir
- sed -i -e 's@\(QT_INCLUDE_PATH=\)\(.*\)@\1-I/usr/qt/3/include/@g' defines.gentoo
- sed -i -e 's@\(QT_INCLUDE_PATH=\)\(.*\)@\1-I/usr/qt/3/include/@g' Data/defines
- # add ldflags to defines.gentoo
- LD_alsa="`pkg-config --libs alsa`" || die "could not find alsa-lib"
- LD_fftw3="`pkg-config --libs fftw3`" || die "could not find fftw libs"
- sed -i -e "s@^LDFLAGS.*@LDFLAGS += $LD_alsa $LD_fftw3 -lrt@g" defines.gentoo
-
- # ################ makefile #############
- # fix Makefile
- epatch "${FILESDIR}/Makefile-make_install.patch"
- # fix odd missing bladenc error (try with lame if bladenc is not installed)
- sed -i -e 's@\(\@bladeenc.*\)@type bladeenc 2>/dev/null \&\& \1 |\| lame $< noise.mp3@g' 2>/dev/null makefile
- # verbose Makefile
- sed -i -e 's:^\t@:\t:g' makefile Data/makefile
- # define Q_OS_LINUX
- sed -i -e'/#ifdef Q_OS_LINUX/'i"#define Q_OS_LINUX" Data/data.h
- # fix qstring.h path
- for i in `grep -l -Ri \<qstring.h\> *`;do
- einfo "qstring.h include dir changed in $i"
- sed -i -e "s@<qstring.h>@\"${QTDIR}/include/qstring.h\"@g" $i
- done
-
- # fix some wrong includes #
- for i in `find -name '*.ui'`;do
- if grep include $i ;then
- sed -ie 's@capacitywidget.h@capacity-widget.h@g' $i
- sed -ie 's@beatgraphanalyzer.h@beatgraph-analyzer.logic.h@g' $i
- sed -ie 's@metricwidget.h@metric-widget.h@g' $i
- fi
- done
-
-
-
-}
-
-src_compile() {
- addwrite "${QTDIR}/etc/settings"
- cp defines.gentoo defines
-
- emake VARTEXFONTS=${T}/fonts
- #${MAKEOPTS}
-}
-
-src_install () {
- # makefile is absolutly a mess so we use portage features
- #make PREFIX="/usr" DESTDIR="${D}" install || die "make install failed"
- dobin `find -maxdepth 1 -type f -perm -+x -a ! -iname 'configure' -printf "%f "`
- insinto /usr/share/${PN}
- doins -r sequences/
- exeinto /usr/bin
- use mp3 && doexe bpmdj-import-mp3.pl
- use vorbis && doexe bpmdj-import-ogg.pl
- dodoc authors changelog copyright readme todo support.txt
- mogrify -format png logo.png
- newicon "${S}/logo.png" "bpmdjlogo.png"
- make_desktop_entry "kbpm-dj" "BpmDj" "bpmdjlogo.png" "AudioVideo;Audio"
-
-}
Modified: trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.6.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.6.ebuild 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-3.6.ebuild 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -27,11 +27,13 @@
src_unpack() {
unpack ${A}
- cd ${S}
+ cd "${S}"
# add our defines
- cp ${FILESDIR}/defines.gentoo defines
+ cp "${FILESDIR}/${PN}-3-defines.gentoo" defines
+ epatch "${FILESDIR}/${P}-include.patch"
+
# and now.. the useflags. What a giant PITA!
# Note: oss could be optional, but compile fails if disabled!
local flags=""
@@ -56,17 +58,17 @@
}
src_install () {
+ mv support.txt support
# makefile is absolutly a mess so we use portage features
- dodoc authors changelog copyright readme todo support.txt
+ dodoc authors changelog copyright readme todo support
dodir /usr/$(get_libdir)/${PN}
exeinto /usr/$(get_libdir)/${PN}
doexe bpmcount bpmdj bpmdjraw bpmmerge bpmplay
# needed too..
- mv sequences ${D}/usr/$(get_libdir)/${PN}
- dodoc authors changelog readme support.txt
+ mv sequences "${D}/usr/$(get_libdir)/${PN}"
# install startup wrapper
- dobin ${FILESDIR}/${PN}.sh
+ dobin "${FILESDIR}/${PN}.sh"
# install logo and desktop entry
- doicon ${FILESDIR}/${PN}.png
+ doicon "${FILESDIR}/${PN}.png"
make_desktop_entry "bpmdj.sh" "BpmDj" ${PN} "AudioVideo;Audio"
}
Added: trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-4.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-4.1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/bpmdj/bpmdj-4.1.ebuild 2010-03-31 22:41:28 UTC (rev 1596)
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=1
+
+inherit eutils qt4
+
+DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
+HOMEPAGE="http://bpmdj.sourceforge.net/";
+SRC_URI="ftp://bpmdj.yellowcouch.org/${PN}/${P}.source.tgz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="alsa jack vorbis"
+
+DEPEND="${RDEPEND}
+ || ( ( x11-libs/qt-core x11-libs/qt-gui )
+ >=x11-libs/qt-4.2:4 )
+ dev-util/pkgconfig"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ vorbis? ( media-sound/vorbis-tools )
+ jack? ( media-sound/jack-audio-connection-kit )
+ =sci-libs/fftw-3*"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # add our defines
+ cp "${FILESDIR}/${PN}-4-defines.gentoo" defines
+
+ # and now.. the useflags. What a giant PITA!
+ # Note: oss could be optional, but compile fails if disabled!
+ local flags=""
+ flags="CFLAGS += -D QT_THREAD_SUPPORT"
+ use alsa && flags="${flags} -D COMPILE_ALSA"
+ use jack && flags="${flags} -D COMPILE_JACK"
+ echo "${flags} -D COMPILE_OSS -D NO_EMPTY_ARRAYS -fPIC" >> defines
+
+ # and the same for LDFLAGS..
+ local lflags=""
+ lflags="LDFLAGS += -lpthread -lm -lrt -lfftw3"
+ use alsa && lflags="${lflags} -lasound"
+ use jack && lflags="${lflags} -ljack"
+ echo "${lflags}" >> defines
+
+ # not to forget our custom C(XX)FLAGS
+ echo "CPP = g++ -g ${CXXFLAGS} -Wall" >> defines
+}
+
+src_compile() {
+ make || die "make failed"
+}
+
+src_install () {
+ # makefile is absolutly a mess so we use portage features
+ for i in authors changelog copyright readme support; do
+ mv ${i}.txt ${i}; dodoc ${i}; done
+ dodir /usr/$(get_libdir)/${PN}
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe bpmcount bpmdj bpmdjraw bpmmerge bpmplay
+ # needed too..
+ mv sequences "${D}/usr/$(get_libdir)/${PN}"
+ #dodoc authors changelog readme support.txt
+ # install startup wrapper
+ dobin "${FILESDIR}/${PN}.sh"
+ # install logo and desktop entry
+ doicon "${FILESDIR}/${PN}.png"
+ make_desktop_entry "bpmdj.sh" "BpmDj" ${PN} "AudioVideo;Audio"
+}
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-destdir.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-destdir.patch 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-destdir.patch 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,41 +0,0 @@
---- bpmdj-2.9.old/makefile 2005-10-09 16:49:36.000000000 +0200
-+++ bpmdj-2.9/makefile 2006-03-11 17:35:04.551889734 +0100
-@@ -1,5 +1,6 @@
- VERSION = 2.9
--DESTDIR = /usr/local/
-+PREFIX = /usr/local
-+DESTDIR =
- #TIME = /usr/bin/time -f ' '\[%e\]
- #ECHO = echo -n
- TIME =
-@@ -146,7 +147,7 @@
-
- bpmdj-bin.tgz: install_files bin
- @echo "[strip]"
-- @strip * 2>/dev/null; exit 0
-+ #@strip * 2>/dev/null; exit 0
- @echo " [tgz] install"
- @tar -cz --no-recursion --ignore-failed-read -T install_files -f bpmdj-bin.tgz 2>/dev/null
-
-@@ -190,10 +191,17 @@
- emacs bpmdj-doc-errors.txt &
-
- install: bpmdj-bin.tgz
-- mkdir -p $(DESTDIR)/bpmdj;
-- cp bpmdj-bin.tgz $(DESTDIR)/bpmdj
-- cd $(DESTDIR)/bpmdj; tar -xzf bpmdj-bin.tgz
-- rm $(DESTDIR)/bpmdj/bpmdj-bin.tgz
-+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bpmdj/tmp $(DESTDIR)$(PREFIX)/bin
-+ rm $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/* -rf
-+ tar -xzf bpmdj-bin.tgz --directory=$(DESTDIR)$(PREFIX)/share/bpmdj/tmp
-+ find $(DESTDIR)$(PREFIX)/share/bpmdj/tmp -perm -700 \
-+ -exec $(INSTALL) -m755 {} $(DESTDIR)$(PREFIX)/bin \;
-+ find $(DESTDIR)$(PREFIX)/share/bpmdj/tmp -iname '*.pl' \
-+ -exec $(INSTALL) -m755 {} $(DESTDIR)$(PREFIX)/bin \;
-+ mv $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/sequences/ \
-+ $(DESTDIR)$(PREFIX)/share/bpmdj/
-+ rm $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/* -rf
-+ rmdir $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/
-
- source.tgz-dist: bpmdj-source.tgz
- @echo " [tgz] "bpmdj-$(VERSION).source.tgz
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-make_install.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-make_install.patch 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-make_install.patch 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,22 +0,0 @@
---- bpmdj-2.9.old/makefile 2005-10-09 16:49:36.000000000 +0200
-+++ bpmdj-2.9/makefile 2006-03-11 17:35:04.551889734 +0100
-@@ -190,10 +190,15 @@
- emacs bpmdj-doc-errors.txt &
-
- install: bpmdj-bin.tgz
-- mkdir -p $(DESTDIR)/bpmdj;
-- cp bpmdj-bin.tgz $(DESTDIR)/bpmdj
-- cd $(DESTDIR)/bpmdj; tar -xzf bpmdj-bin.tgz
-- rm $(DESTDIR)/bpmdj/bpmdj-bin.tgz
-+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bpmdj/tmp $(DESTDIR)$(PREFIX)/bin
-+ rm $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/* -rf
-+ tar -xzf bpmdj-bin.tgz --directory=$(DESTDIR)$(PREFIX)/share/bpmdj/tmp
-+ find $(DESTDIR)$(PREFIX)/share/bpmdj/tmp -perm -700 \
-+ -exec $(INSTALL) -m755 {} $(DESTDIR)$(PREFIX)/bin \;
-+ mv $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/sequences/ \
-+ $(DESTDIR)$(PREFIX)/share/bpmdj/
-+ rm $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/* -rf
-+ rmdir $(DESTDIR)$(PREFIX)/share/bpmdj/tmp/
-
- source.tgz-dist: bpmdj-source.tgz
- @echo " [tgz] "bpmdj-$(VERSION).source.tgz
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-nostrip.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-nostrip.patch 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-nostrip.patch 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,10 +0,0 @@
---- bpmdj-2.9.old/makefile 2005-10-09 16:49:36.000000000 +0200
-+++ bpmdj-2.9/makefile 2006-03-11 17:35:04.551889734 +0100
-@@ -146,7 +147,7 @@
-
- bpmdj-bin.tgz: install_files bin
- @echo "[strip]"
-- @strip * 2>/dev/null; exit 0
-+ #@strip * 2>/dev/null; exit 0
- @echo " [tgz] install"
- @tar -cz --no-recursion --ignore-failed-read -T install_files -f bpmdj-bin.tgz 2>/dev/null
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-prefix.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-prefix.patch 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/Makefile-prefix.patch 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,10 +0,0 @@
---- bpmdj-2.9.old/makefile 2005-10-09 16:49:36.000000000 +0200
-+++ bpmdj-2.9/makefile 2006-03-11 17:35:04.551889734 +0100
-@@ -1,5 +1,6 @@
- VERSION = 2.9
--DESTDIR = /usr/local/
-+PREFIX = /usr/local
-+DESTDIR =
- #TIME = /usr/bin/time -f ' '\[%e\]
- #ECHO = echo -n
- TIME =
Added: trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3-defines.gentoo
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3-defines.gentoo (rev 0)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3-defines.gentoo 2010-03-31 22:41:28 UTC (rev 1596)
@@ -0,0 +1,13 @@
+UIC3 = /usr/bin/uic3
+RCC = /usr/bin/rcc
+UIC = /usr/bin/uic
+MOC = /usr/bin/moc
+QT_INCLUDE_PATH = -I/usr/include/qt4 -I/usr/include/qt4/Qt
+QT_LIBRARY_PATH = -L/usr/lib/qt4
+QT_LIBS = -lQt3Support -lQtGui -lQtCore
+CP = cp
+MV = mv
+TAR = tar
+MKDIR = mkdir
+STRIP = strip
+INSTALL = install
Added: trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3.6-include.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3.6-include.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-3.6-include.patch 2010-03-31 22:41:28 UTC (rev 1596)
@@ -0,0 +1,10 @@
+--- ./numbers.h.old 2007-08-09 23:38:21.000000000 +0500
++++ ./numbers.h 2010-04-01 00:41:57.000000000 +0500
+@@ -23,6 +23,7 @@
+
+ #ifndef OM_NUMBERS_H
+ #define OM_NUMBERS_H
++#include <stdlib.h>
+ #include "data.h"
+ #include "data-visitor.h"
+
Added: trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-4-defines.gentoo
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-4-defines.gentoo (rev 0)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/bpmdj-4-defines.gentoo 2010-03-31 22:41:28 UTC (rev 1596)
@@ -0,0 +1,13 @@
+UIC3 = /usr/bin/uic3
+RCC = /usr/bin/rcc
+UIC = /usr/bin/uic
+MOC = /usr/bin/moc
+QT_INCLUDE_PATH = -I/usr/include/qt4 -I/usr/include/qt4/Qt
+QT_LIBRARY_PATH = -L/usr/lib/qt4
+QT_LIBS = -lQtGui -lQtCore
+CP = cp
+MV = mv
+TAR = tar
+MKDIR = mkdir
+STRIP = strip
+INSTALL = install
Deleted: trunk/overlays/proaudio/media-sound/bpmdj/files/defines.gentoo
===================================================================
--- trunk/overlays/proaudio/media-sound/bpmdj/files/defines.gentoo 2010-03-30 21:57:20 UTC (rev 1595)
+++ trunk/overlays/proaudio/media-sound/bpmdj/files/defines.gentoo 2010-03-31 22:41:28 UTC (rev 1596)
@@ -1,13 +0,0 @@
-UIC3 = /usr/qt/3/bin/uic
-RCC = /usr/bin/rcc
-UIC = /usr/bin/uic
-MOC = /usr/bin/moc
-QT_INCLUDE_PATH = -I/usr/include/qt4 -I/usr/include/qt4/Qt
-QT_LIBRARY_PATH = -L/usr/lib/qt4
-QT_LIBS = -lQt3Support -lQtGui -lQtCore
-CP = cp
-MV = mv
-TAR = tar
-MKDIR = mkdir
-STRIP = strip
-INSTALL = install