| [proaudio] [2201] museseq: fixed 2.9999; masked the other ebuilds |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2201
Author: dominique
Date: 2012-08-12 14:15:07 +0200 (Sun, 12 Aug 2012)
Log Message:
-----------
museseq: fixed 2.9999; masked the other ebuilds
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/museseq/ChangeLog
trunk/overlays/proaudio/media-sound/museseq/Manifest
trunk/overlays/proaudio/media-sound/museseq/metadata.xml
trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild
trunk/overlays/proaudio/profiles/package.mask
Modified: trunk/overlays/proaudio/media-sound/museseq/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/ChangeLog 2012-08-11 21:54:41 UTC (rev 2200)
+++ trunk/overlays/proaudio/media-sound/museseq/ChangeLog 2012-08-12 12:15:07 UTC (rev 2201)
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Aug 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>
+ museseq-2.9999.ebuild: A lot of changes to make it to work.
+ masqued the other ebuilds: fix needed
+
*museseq-1.0.1 (30 Apr 2010)
30 Apr 2010; Viktor Lazarev <taurus101v@xxxxxxxxx>
Modified: trunk/overlays/proaudio/media-sound/museseq/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/Manifest 2012-08-11 21:54:41 UTC (rev 2200)
+++ trunk/overlays/proaudio/media-sound/museseq/Manifest 2012-08-12 12:15:07 UTC (rev 2201)
@@ -1,11 +1,11 @@
-AUX fix_zyn.patch 1115 RMD160 d5c4ecec65534f7e47cb928f58b045c50179ad8a SHA1 61d832a3adb6376c0b7570311514c4b157706e6a SHA256 0a66f0dfc9451efd7a19833dbb22a7abc6382e6857596c54475ff14eadf20ee7
-AUX museseq-9999-find_fltk.patch 363 RMD160 4fa8453e42443fd03f2d270560eac71e3d83e5e0 SHA1 7f59d4478601e533f5234a5ef802f8f0c7b32ccb SHA256 e31ec9777580f44a9c7facea9122c5c4a9e9e3ba4090a98968598e40d85889f2
-AUX sse_functions_64bit.s 12051 RMD160 8532994c45d1a0c2323411de26f121bb3a632350 SHA1 8a4ee6c6e2c7179daf1723d8f92873c3c4374f6b SHA256 460e6f8ec1a8a4691a72ebec5551c0104f933ea500c6f93ee51be47fb8508285
-DIST muse-1.0.1.tar.gz 2666184 RMD160 85b3325b9a7cf3b29733dc9c01ee7a5fcc081eb5 SHA1 9846c1df9d46b8ff50dfa428bc1c71a7b425abd9 SHA256 e78cb3f01791974976bc7577478d1cbecfdb7c5b3694fa742038b682a1abe03b
-DIST muse-1.0rc1.tar.gz 2461851 RMD160 ada06aa176756de54f650a0feb6d4958d6c1bf40 SHA1 db20ff7b039370a10f8bf7e56c415842a618b8b7 SHA256 c5f9fd6ad978dc789de1f60329b904d0476a142525d80ddaad3c13850fded756
-EBUILD museseq-1.0.1.ebuild 2309 RMD160 c753bf1f2aa0e221115a04cb491f9583e0072d19 SHA1 004239e607796a229dfd86c6632a52c116a40b30 SHA256 a0ef5c424049ec3a4bd8d7fee1cc45ca79894386191a6b55c186dbf47731eadf
-EBUILD museseq-1.0_rc1.ebuild 1933 RMD160 4c2b4a26f1c929cec54c2ebba171893deb490b1d SHA1 fbb27a2bc823df9517c776aa788633d32863da17 SHA256 78667aa31644c03a697d82af4fe2302732d791e4461d733c84af00288a098333
-EBUILD museseq-1.9999.ebuild 2119 RMD160 7d71bc973b41466c3aafdb4d76c8a2925bb54794 SHA1 09802c1a44fa96cf509924acedf303866eacb3f3 SHA256 40b33b99e1e570737ab4f446a35175b200677c28fa6d59d32dfc6020699612b2
-EBUILD museseq-2.9999.ebuild 2619 RMD160 dce68d6918b2fb4e9503231a99ef1066d96832bb SHA1 17b03bd6b116b5249a5a147edc77c61d89128da7 SHA256 6781a853d33c81293a7551751c6abac5d595befeae0d4237c200bc94f8c2de5f
-MISC ChangeLog 1571 RMD160 44f41f0c63d3f54d2355f2ef8ca2def3fa57c496 SHA1 741dcee09c27c1f063209c214f4acd3853ebf1a3 SHA256 44a1f28a61f7f373215e8ab9a9871bd9c8f9f7431944b74c59693b29e9ff01f9
-MISC metadata.xml 403 RMD160 f54842a83c6d3d1aaa99ebc110744d28b17eb4cf SHA1 a98f705024fd03d18198ed61ab77e0de72b76831 SHA256 69a090e01608a5e43e0115774b6dfd83783fe80e884195fd36582be4d4f176d6
+AUX fix_zyn.patch 1115 SHA256 0a66f0dfc9451efd7a19833dbb22a7abc6382e6857596c54475ff14eadf20ee7 SHA512 24d2e4966450dbafb4b49fda7b0617768649f5f6666bfc62292e102f9c097961d9db7c3a73a0f0a7e69dd0547d81ebafcb01e0e74cb5e6891abf0464e7a9a14d WHIRLPOOL bce35658846fb097a45e266f92e57d67d1df829c76deb7ed72cc0b3ad3761209070ee41c0be504cc9d37fd4d60e50db345c6c766dcef1a3c9e53eaeb407d7ca1
+AUX museseq-9999-find_fltk.patch 363 SHA256 e31ec9777580f44a9c7facea9122c5c4a9e9e3ba4090a98968598e40d85889f2 SHA512 bd484a05d0b925d9cce391d3a68d4c5f54afd19fec414e313335998a54c16a492d559f526ab86249b8d1e211c8a130f7918405332488585823dbe25e8a82b532 WHIRLPOOL 14638c7758306a5e5dd628d67db469866bafce4e19d41195e062c2bd345f46b80c9afdbd28a38176fe91670da166a0485bb5aa3106d3dadccf1fb724ee2238fe
+AUX sse_functions_64bit.s 12051 SHA256 460e6f8ec1a8a4691a72ebec5551c0104f933ea500c6f93ee51be47fb8508285 SHA512 14713938ef5c5cc8f0f9173b9d21729d9a01d3231f16f0322b9d5ff234bdeb2e0d582397ed2b6b6ca1c33237b8243d0241904eadd0f260e5b40cb25d8991513b WHIRLPOOL 045dfe3b99281836a5b9098c18b9692af98125b771532b51e44bc4585b931c3a43a30095da1d63a6bcd6d0131afc694bcd43e93d3c699158ae2d11d334637156
+DIST muse-1.0.1.tar.gz 2666184 SHA256 e78cb3f01791974976bc7577478d1cbecfdb7c5b3694fa742038b682a1abe03b SHA512 cd03048fe093221bfdcd77b43666ca3dcb8cca77219dcecb06ebc618c3433de534b70a38b8380bcf039e594737fef6b11aff4a2e04a2141fd5323d232bdc0c60 WHIRLPOOL f9192d82c56d5b3782c12428efbd561d799ad08804a9567671dd0ec684bf25961398fd6b49533d0098eb33ebe72a552d0899a387850346e462af29d826031c7d
+DIST muse-1.0rc1.tar.gz 2461851 SHA256 c5f9fd6ad978dc789de1f60329b904d0476a142525d80ddaad3c13850fded756
+EBUILD museseq-1.0.1.ebuild 2309 SHA256 a0ef5c424049ec3a4bd8d7fee1cc45ca79894386191a6b55c186dbf47731eadf SHA512 16403016c58cd31a10532ab4a272de1d917a0ac57748d49e8e83e5676283ecbc821325f191e2610918ac2ec46fcf4a26782250cabf2c5d939be26cc665809a54 WHIRLPOOL 617ee4a07279e67b2a2b1388a39b0aba36da837877902bcce15094de4c17639a3db7b8cadfb48e71d9d35587725aebd062cf9bdd8966b396320b018717692d8e
+EBUILD museseq-1.0_rc1.ebuild 1933 SHA256 78667aa31644c03a697d82af4fe2302732d791e4461d733c84af00288a098333 SHA512 8497a9df2338c2a03eb0ee68819ffe24cc11de0cdb8b716bc40209c728ebbeaf555398c873cac93f1c88f61524ffe7064744b99e8c2bd8524108137f4684f271 WHIRLPOOL cc5cc8708f9989bb881d0186f73d00e051cc758e86dc351361b013dc86e65a675fa3fb313e3805c232f327f7cd40946a729d9cacd09bfcce63effbe200835f03
+EBUILD museseq-1.9999.ebuild 2119 SHA256 40b33b99e1e570737ab4f446a35175b200677c28fa6d59d32dfc6020699612b2 SHA512 05a15cc71ab4b4de34c7743b1266d9bbb6f052e005ddc06c1200ad001cebb314b41bd017663321c25e5b737b493a676e80777ef0e1131e474989e1208e81a380 WHIRLPOOL 5461afdf717bc077dc22877a80c060462cc18b150d38047a7217a780d334129718a6fb624c203ae63da705393614ce9e3d53e2b5a9916ae4b13e321206dc1d4c
+EBUILD museseq-2.9999.ebuild 2981 SHA256 fd6246566f6343f1db389be47b504ed911f05a4b6350575f7b55d1b5f791bb42 SHA512 e8e8b7f03d04c7da0a623ab3be0bd86f67ba8f59e2733b3f67fabd691f8aaa06d3b75d141d2b10064a205a58d00b17cfe602839a62db0586fb01bc1700e41138 WHIRLPOOL c8d3886f2c0662c72ac8db9191f554f9ec71cc1ed178061f58b95e0d36292975122f337ee7862b3a20cd5df4b704a894bdc5766a8005c64da1e36758162e20d7
+MISC ChangeLog 1732 SHA256 77e9e89475afb90bbabf69c21f5f616b0b90105be4da4e127db94b8cdfcb704b SHA512 cc329b013b8eeeae78fdb4e06cd410a891fb411f6fc6aacfc945e329fa65591a4048bedc0839d17b95429bb78bfa211f35491c3a3f0bf5ca5d94d78a51850bdb WHIRLPOOL c4db597654b4cce47323858f74eab58daa5eb1045bd2fae2c9ca6c732d2643f1b7008d24ca03b9c8273bc8a881e3da7523611c8df4f1c446171cd12aa91b3cb1
+MISC metadata.xml 885 SHA256 197b2ea76013abb1ce23b15d0b3d92e5b4248023d24230923894ce15ebb65eca SHA512 048b5891bd69e335896e6d8a4184dc36203d1a73b414efa051283c29187aecdf90c3e8bc4a7f51deffba87b7e7253c88ad7650231a4f85f05df5046ee2da1fa3 WHIRLPOOL 3a63b3f4963df570aba8c6f6a73393397dc6a2aea7083d21f4396281cc5159c1c25c976168eaa84a9aedbb69162edab788b8fb076fb3fe24b40a0763babc8bbd
Modified: trunk/overlays/proaudio/media-sound/museseq/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/metadata.xml 2012-08-11 21:54:41 UTC (rev 2200)
+++ trunk/overlays/proaudio/media-sound/museseq/metadata.xml 2012-08-12 12:15:07 UTC (rev 2201)
@@ -7,7 +7,15 @@
<name>pro-audio overlay team</name>
</maintainer>
<use>
+ <flag name="doc">Install the depends needed to build the doc</flag>
+ <flag name="dssi">Enable dssi and dssi-vst support</flag>
+ <flag name="experimental">Enable experimental features</flag>
<flag name="fluidsynth">Enable fluidsynth support</flag>
+ <flag name="lash">Enable lash support</flag>
+ <flag name="optimization">Enable Release build type</flag>
+ <flag name="osc">Enable OSC support</flag>
+ <flag name="python">Enable python control module build</flag>
+ <flag name="vst">Enable obsolated vst support trough fst/wine</flag>
<flag name="zynaddsubfx">Enable zynaddsubfx support</flag>
</use>
</pkgmetadata>
Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild 2012-08-11 21:54:41 UTC (rev 2200)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild 2012-08-12 12:15:07 UTC (rev 2201)
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="4"
+PYTHON_DEPEND="2"
-inherit subversion eutils toolchain-funcs cmake-utils flag-o-matic
+inherit subversion eutils toolchain-funcs cmake-utils flag-o-matic python
-ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse_qt4_evolution";
+MY_PN=${PN/museseq/muse2}
+ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/${MY_PN}";
-MY_PN=${PN/museseq/muse}
S=${WORKDIR}/${MY_PN}
DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
@@ -17,7 +18,7 @@
LICENSE="GPL-2"
SLOT="1"
KEYWORDS=""
-IUSE="doc dssi fluidsynth lash vst zynaddsubfx"
+IUSE="doc +dssi -experimental fluidsynth lash optimization +osc -python -vst"
RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-xmlpatterns
x11-libs/qt-qt3support x11-libs/qt-svg )
@@ -28,68 +29,85 @@
>=media-libs/libsndfile-1.0.1
>=media-libs/libsamplerate-0.1.0
>=media-sound/jack-audio-connection-kit-0.102.2
- dssi? ( >=media-libs/dssi-0.9.0 )
+ dssi? ( >=media-libs/dssi-0.9.0
+ media-plugins/dssi-vst )
lash? ( >=media-sound/lash-0.4.0 )
- zynaddsubfx? ( =x11-libs/fltk-1.1*
- >=dev-libs/mini-xml-2 )
- vst? ( media-libs/fst )"
+ vst? ( >=media-libs/fst-9999 )"
DEPEND="
>=dev-util/cmake-2.4.7
=sys-devel/gcc-4*
- doc? ( app-text/openjade
- app-doc/doxygen
- media-gfx/graphviz )"
+ doc? ( dev-texlive/texlive-context
+ app-text/openjade
+ app-doc/doxygen
+ media-gfx/graphviz )
+ sys-apps/util-linux"
+if use optimization ; then
+ CMAKE_BUILD_TYPE="Release"
+fi
+
+pkg_setup() {
+ if use osc ; then
+ if ! use dssi ; then
+ ewarn "You enabled the osc use flag, it won't build without"
+ ewarn "the dssi use flag!"
+ die
+ fi
+ fi
+ if use vst ; then
+ ewarn "vst is onsoleted, considere to use dssi instead."
+ fi
+ python_set_active_version 2
+ python_pkg_setup
+}
+
src_unpack() {
subversion_src_unpack
- cd "${S}"
}
src_prepare() {
+ cd "${MY_S}" || die "cd failed"
# copy over correct header from ardour in case of amd64
- use amd64 && cp "${FILESDIR}/sse_functions_64bit.s" al/dspSSE.cpp
-
- # find fltk
- epatch "${FILESDIR}/${PN}-9999-find_fltk.patch"
- #sed -e "/set (FLTK_INCLUDE/s/include\"/include\/fltk-1.1\"/" \
- # -i CMakeLists.txt || die "FLTK path fix failed"
-
- # doc stuff
- use doc || sed -i -e 's@muse share doc@muse share@' CMakeLists.txt
+ use amd64 && cp "${FILESDIR}/sse_functions_64bit.s" al/dspSSE.cpp || die "cd failed"
+
+ # patch gor correct build with USE=experimental
+ sed -i -e 's:-DBUILD_EXPERIMENTAL ${CMAKE_CXX_FLAGS}:"-DBUILD_EXPERIMENTAL ${CMAKE_CXX_FLAGS}":' \
+ ${S}/CMakeLists.txt || die "sed failed"
}
src_configure() {
# linking with --as-needed is broken :(
- filter-ldflags -Wl,--as-needed --as-needed
+# filter-ldflags -Wl,--as-needed --as-needed
# work around -lQtSvg not found error
- append-flags "-L/usr/$(get_libdir)/qt4"
- append-ldflags "-L/usr/$(get_libdir)/qt4"
+# append-flags "-L/usr/$(get_libdir)/qt4"
+# append-ldflags "-L/usr/$(get_libdir)/qt4"
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_enable dssi DSSI)
- $(cmake-utils_use_enable vst VST)
+ $(cmake-utils_use_enable experimental EXPERIMENTAL)
+ $(cmake-utils_use_enable osc OSC)
$(cmake-utils_use_enable fluidsynth FLUID)
$(cmake-utils_use_enable zynaddsubfx ZYNADDSUBFX)
+ $(cmake-utils_use_enable python PYTHON)
+ $(cmake-utils_use_enable vst VST)
"
+
cmake-utils_src_configure
# workaround empty revision.h
- svn info ${ESVN_STORE_DIR}/${PN}/muse | grep Revision | \
- cut -f 2 -d " " > "${WORKDIR}/${PN}_build/revision.h" \
- || die "generating revision.h failed"
+# svn info ${ESVN_STORE_DIR}/${PN}/muse | grep Revision | \
+# cut -f 2 -d " " > "${WORKDIR}/${PN}_build/revision.h" \
+# || die "generating revision.h failed"
}
src_install() {
- DOCS="AUTHORS ChangeLog NEWS README SECURITY Reference"
+ DOCS=""
cmake-utils_src_install
- mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq-2.0"
- mv "${D}/usr/bin/grepmidi" "${D}/usr/bin/grepmidi-2.0"
- newicon "${S}/packaging/muse_icon.png" "museseq.png"
- make_desktop_entry "museseq-2.0" "MusE Sequencer 2.0" museseq \
- "AudioVideo;Audio;Sequencer"
+ mv "${D}/usr/bin/grepmidi" "${D}/usr/bin/grepmidi2"
+ mv "${D}/usr/share/man/man1/grepmidi.1" "${D}/usr/share/man/man1/grepmidi2.1" || die
}
Modified: trunk/overlays/proaudio/profiles/package.mask
===================================================================
--- trunk/overlays/proaudio/profiles/package.mask 2012-08-11 21:54:41 UTC (rev 2200)
+++ trunk/overlays/proaudio/profiles/package.mask 2012-08-12 12:15:07 UTC (rev 2201)
@@ -3,6 +3,12 @@
# NOTE: Please add your entry at the top!
#
+# Dominique Michel <dominique@xxxxxxxxxxxxx> 12 Aug (2012)
+# Old ebuilds, they just don't work anymore. Fix or removing needed.
+=media-sound/museseq-1.0.1
+=media-sound/museseq-1.0_rc1
+=media-sound/museseq-1.9999
+
# Frieder Buerzele <evermind@xxxxxxxxxxxxx> (21 Jan 2012)
# they are old ebuild, but they separate the banks into another ebuild.
# so there needs to be a review later on those ebuilds. But for now masked