| [proaudio] [1372] museseq-9999 build fix, still doesn't find fltk |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1372
Author: gimpel
Date: 2008-12-01 14:06:04 +0100 (Mon, 01 Dec 2008)
Log Message:
-----------
museseq-9999 build fix, still doesn't find fltk
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/museseq/Manifest
trunk/overlays/proaudio/media-sound/museseq/museseq-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch
Modified: trunk/overlays/proaudio/media-sound/museseq/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/Manifest 2008-12-01 10:43:32 UTC (rev 1371)
+++ trunk/overlays/proaudio/media-sound/museseq/Manifest 2008-12-01 13:06:04 UTC (rev 1372)
@@ -2,6 +2,7 @@
AUX 0.9.9999/04_all_asneeded.patch 531 RMD160 aebf5a6a52313ea3f6e9678b91bf9236ed5c3b75 SHA1 06b408317dc4a1d8070df338201113f36eab313e SHA256 0ee3c1eaf6680db9cace739e9271bbe9f8455986a26355f9ceae7743a3b2b368
AUX 0.9.9999/amd64.diff 2781 RMD160 e3c00c771dffa50c1373a7c60d6c016e556a6d39 SHA1 c6287a77c8b303dbbcbbb725e3c18b299cc66687 SHA256 cbcf552f5040139d0c7a13a58c0c0c65d25cbaa87aa17d77edbaea6d23ea24bf
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-0.9pre1.tar.gz 2330079 RMD160 b77a3516ad0653f6e1ddeddb6ae3a7daa01e02f2 SHA1 bfea01acf8649f9cfd4f000247ab62a09a054b48 SHA256 48df0d1cb27f89b47323de72f9b80275f1d0b504960a5e7147f07d192ee0afb2
DIST muse-0.9pre2.tar.gz 2343753 RMD160 104eb9602cf86f93789a5201643f04a82075f0b3 SHA1 9c826904de8e6423d0a842cb1333b38256734e22 SHA256 e8b59e24e4427254f95de85bf573a36b71fed17a8bc1feaf854ba8dc50cc0860
@@ -12,6 +13,6 @@
EBUILD museseq-0.9_pre2.ebuild 2346 RMD160 65740535a23860e39c2804e63b14859ca43fc90d SHA1 553226a38f05ddcf2f40a5522bcd617b9c0d4779 SHA256 a27583546a0c6fbe84d64c5000e90dd848496e3995866e797ae2866979f4ac72
EBUILD museseq-0.9_pre3.ebuild 1616 RMD160 aa68d4ff99f55a80bd728209ac375604cc6ced57 SHA1 6312168c0429f5b0d69498b0eb1b5f57344e2ff9 SHA256 edc826bf1b0f8af9010e293968755b7bb9aaf1ead8b598ee8e9efc1f02c366b8
EBUILD museseq-1.0_pre1.ebuild 2233 RMD160 96c5771c6d40bef0b4550abcbde4b13f8735c51d SHA1 bf6ba64baa1854c5ca1b272e7151f870960a1215 SHA256 3b5501064abd6d437c7d0e2d5a9e35d30ab59c839ac829e65a49eb6a8da2bb1d
-EBUILD museseq-9999.ebuild 3365 RMD160 11de7671649649c910b65f02e5108d4834a78092 SHA1 65d7c1f30d7058397a3752f425fb2644ff421c9e SHA256 59c7e3ac84329b4ac25a4cdba83c1ce572b75b5b7b30f045cc4833d8f7c7887c
+EBUILD museseq-9999.ebuild 2464 RMD160 3ab75feb3ec6b2ae0c2f6cee65647f29fc0c8f5c SHA1 256eb5a2eef317cee05ef14f92bf798c6847cd04 SHA256 74ac53251466cb810e503c5b904c4560357e274bf7735f5aac376b15cbe87ed9
MISC ChangeLog 642 RMD160 3460920090c7dbd121abcb11ce8426f0ec744461 SHA1 e9799fefa15e4f1d4675f31ca8a82d5001a7222e SHA256 dff46f1ecb41f68c22af06394f951359bee0dfdc1315c92d05a279f6c49a0ea1
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch 2008-12-01 13:06:04 UTC (rev 1372)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2008-12-01 13:04:16.000000000 +0100
++++ CMakeLists.txt 2008-12-01 13:05:16.000000000 +0100
+@@ -126,7 +126,7 @@
+
+ if (ENABLE_ZYNADDSUBFX)
+ # HACK:
+- set (FLTK_INCLUDE_DIR "/usr/include")
++ set (FLTK_INCLUDE_DIR "/usr/include/fltk-1.1")
+ set(FLTK_FLUID_EXECUTABLE "/usr/bin/fluid")
+
+ include (FindFLTK)
Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-9999.ebuild 2008-12-01 10:43:32 UTC (rev 1371)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-9999.ebuild 2008-12-01 13:06:04 UTC (rev 1372)
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=1
+EAPI=2
-inherit subversion virtualx eutils toolchain-funcs qt4 patcher flag-o-matic
+inherit subversion eutils toolchain-funcs cmake-utils flag-o-matic
ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse";
RESTRICT="ccache"
@@ -18,11 +18,11 @@
LICENSE="GPL-2"
SLOT="1"
KEYWORDS=""
-IUSE="doc dssi fluidsynth vst zynaddsubfx"
+IUSE="doc dssi fluidsynth lash vst zynaddsubfx"
DEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-xmlpatterns
x11-libs/qt-qt3support x11-libs/qt-svg )
- >=x11-libs/qt-4.2:4 )
+ >=x11-libs/qt-4.2:4[qt3support] )
>=dev-util/cmake-2.4.7
=sys-devel/gcc-4*
>=media-libs/alsa-lib-1.0
@@ -36,27 +36,10 @@
>=media-sound/jack-audio-connection-kit-0.102.2
dssi? ( >=media-libs/dssi-0.9.0 )
lash? ( >=media-sound/lash-0.4.0 )
- !media-sound/museseq-cvs
- !media-sound/museseq-svn
zynaddsubfx? ( =x11-libs/fltk-1.1*
>=dev-libs/mini-xml-2 )
vst? ( media-libs/fst )"
-pkg_setup() {
- if ! built_with_use ">=x11-libs/qt-4" qt3support; then
- eerror "atm $PN needs qt3support "
- eerror "You will have to compile >=qt-4 with USE=\"qt3support\"."
- die
- fi
-
- # check if libfst is valid
-# if [ -e "/usr/lib/pkgconfig/libfst.pc" ];then
-# egrep -q '1.8|1.7' /usr/lib/pkgconfig/libfst.pc &>/dev/null && \
-# eerror "try to update fst: at least to fst-1.8-r3 or uninstall fst
-# or just remove /usr/lib/pkgconfig/libfst.pc" && die
-# fi
-}
-
src_unpack() {
subversion_src_unpack
cd ${S}
@@ -64,52 +47,43 @@
# copy over correct header from ardour in case of amd64
use amd64 && cp ${FILESDIR}/sse_functions_64bit.s al/dspSSE.cpp
- #patcher "${FILESDIR}/fix_zyn.patch apply"
- mkdir build
+ # find fltk
+ epatch "${FILESDIR}/${P}-find_fltk.patch"
# doc stuff
use doc || sed -i -e 's@muse share doc@muse share@' CMakeLists.txt
}
-src_compile() {
+src_configure() {
# linking with --as-needed is broken :(
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"
- cd "${S}/build"
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_DSSI="$(! use dssi; echo "$?")" \
- -DENABLE_VST="$(! use vst; echo "$?")" \
- -DENABLE_FLUID="$(! use fluidsynth; echo "$?")" \
- -DENABLE_ZYNADDSUBFX="0" \
- -DENABLE_ZYNADDSUBFX="$(! use zynaddsubfx; echo "$?")"
-
- use doc && cmake ../doc/CMakeLists.txt
-
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_enable dssi DSSI)
+ $(cmake-utils_use_enable vst VST)
+ $(cmake-utils_use_enable fluidsynth FLUID)
+ $(cmake-utils_use_enable zynaddsubfx ZYNADDSUBFX)
+ "
+ cmake-utils_src_configure
+
# workaround empty revision.h
svn info ${ESVN_STORE_DIR}/${PN}/muse | grep Revision | \
- cut -f 2 -d " " > ${S}/build/revision.h \
+ cut -f 2 -d " " > ${WORKDIR}/${PN}_build/revision.h \
|| die "generating revision.h failed"
- emake -j1 || die "build failed"
}
src_install() {
- cd "${S}/build"
- make DESTDIR=${D} install || die "install failed"
- cd "${S}"
- dodoc AUTHORS ChangeLog NEWS README SECURITY Reference
- mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq-1.0"
- mv "${D}/usr/bin/grepmidi" "${D}/usr/bin/grepmidi-1.0"
+ DOCS="AUTHORS ChangeLog NEWS README SECURITY Reference"
+ 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-1.0" "MusE Sequencer 1.0" museseq \
+ make_desktop_entry "museseq-2.0" "MusE Sequencer 2.0" museseq \
"AudioVideo;Audio;Sequencer"
}
-
-pkg_postinst() {
- einfo "You must have the realtime module loaded to use MusE 1.0.x"
- einfo "Additionally, configure your Linux Kernel for non-generic"
- einfo "Real Time Clock support enabled or loaded as a module."
- einfo "User must have read/write access to /dev/misc/rtc device."
- einfo "Realtime LSM: http://sourceforge.net/projects/realtime-lsm/";
-}
-