| [proaudio] [1084] bump mixxx-1.6.0_beta1 and fixing -9999 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1084
Author: evermind
Date: 2008-01-04 10:55:57 +0000 (Fri, 04 Jan 2008)
Log Message:
-----------
bump mixxx-1.6.0_beta1 and fixing -9999
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
trunk/overlays/proaudio/media-sound/mixxx/Manifest
trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2008-01-02 13:26:07 UTC (rev 1083)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2008-01-04 10:55:57 UTC (rev 1084)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/mixxx
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx> ChangeLog:
+ bumped mixxx-1.6.0_beta1
+ fix own cflags and USE flag selection in (1.6.0_beta1 and 9999)
+
17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
added a changelog
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2008-01-02 13:26:07 UTC (rev 1083)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2008-01-04 10:55:57 UTC (rev 1084)
@@ -2,9 +2,11 @@
DIST mixxx-1.5.0-beta1.tar.gz 4271527 RMD160 a9b4bf21180ce24fbdd652442c24d461c68985ac SHA1 02803dc00fe153c9101712ee8335abc8aaf77fb6 SHA256 c1194a191af2fac698a7b91c63baf909ab8bb1c393d00520284a4f6ad1348c80
DIST mixxx-1.5.0-src.tar.bz2 4034791 RMD160 14ed3139fa242a42ed234b778b23760d3b15ec17 SHA1 0b0d921ed8dfddfe0d19cd9d219e83340d7a7a84 SHA256 2b82a305bab89ca866f50f6d0fb5eaf2c567d5727ba2442802d21a02ab109855
DIST mixxx-1.5.0.1-src.tar.bz2 4034791 RMD160 14ed3139fa242a42ed234b778b23760d3b15ec17 SHA1 0b0d921ed8dfddfe0d19cd9d219e83340d7a7a84 SHA256 2b82a305bab89ca866f50f6d0fb5eaf2c567d5727ba2442802d21a02ab109855
+DIST mixxx-1.6.0-beta1-src.tar.gz 7131246 RMD160 72d4a04d9dbfd94020a4cda77cb2ebedb86e0649 SHA1 133f34f1228a6a7f10ad7dff2887f09b8f6b68b0 SHA256 cfad6b8500232e124e39ff913100e673e1ff5ea288268ded8e00b1e24664c7fd
EBUILD mixxx-1.5.0.1.ebuild 1637 RMD160 2ffec645c60783c234aa1a22d639c962adcf3d72 SHA1 800d5056bec561a0a79c876d750c1c9719dba367 SHA256 2c2074fab63b77078950afb0cdf151faab11e67e8f5f8793d24644904738e0d2
EBUILD mixxx-1.5.0.ebuild 1652 RMD160 eee83dd612fa1d88c452edf05230cc7248cf4ea1 SHA1 a99b88a37f377d514817e098a174f334fbc186f2 SHA256 311d86120777ac2d3590e74fd6dc7a5329ff18a2a522bb7a1c5ada0d03cf0f23
EBUILD mixxx-1.5.0_beta1.ebuild 1615 RMD160 88daf1af9f1570835b237dce1516ca0bafe0be56 SHA1 9e2456ce3e239ec56e069878bb2bdf97680703ec SHA256 415ad032b452145974e27d075bfb6af2bb2c51bbbd774bea8bba9dc68cb8ad93
-EBUILD mixxx-9999.ebuild 2276 RMD160 058dfc3a3dfc1c7090e234988f4cf97642e67f9e SHA1 c88fbacea70920cc41e08cf95b437500767c95ea SHA256 78b8893bab99def6cbf62ab8c29ed3a43f9d57ef1d4fc2893b29d2b1b9a047d7
-MISC ChangeLog 205 RMD160 f1222934a752b697b300d430efbe4ed7a08230bf SHA1 82af68ee5680e00eb6e5460f9366ff9fcce8e578 SHA256 bb388eb87fe986dcf6897b49556c1b45fbe9f2d5a7a09d7826c12b0bd0444e3a
+EBUILD mixxx-1.6.0_beta1.ebuild 2508 RMD160 0552e60e24c5ed189d13837eeb94fddd5bcc8722 SHA1 a8c6af9343124bec4e4200a94f16e020b1e5d843 SHA256 e97e6ab4d03a4250809380324f7bd50423186fc2841a88f4e55b58471f190ba4
+EBUILD mixxx-9999.ebuild 2410 RMD160 b1b7d6b816649bf75591c09de046d4ec9bbdbd5c SHA1 049a67548b75c202621d35ef17655c885a1b81b6 SHA256 8a33b64a7905b678412b9c482c6191f6fe2959e60ee644ce01b3e11d9ac891d2
+MISC ChangeLog 368 RMD160 73fe90146418e5a065c9ea32d469a54c9a7b1b59 SHA1 bb78a4f9ce4faee0bba3872af5a4e411ee7baedf SHA256 495749cc044e1475cfc12d5172c5c26ba0a8398070004dabf7eefa3e68ad346a
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.6.0_beta1.ebuild 2008-01-04 10:55:57 UTC (rev 1084)
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+RESTRICT="nomirror"
+
+inherit exteutils qt4 toolchain-funcs versionator
+MY_P="${PN}-$(replace_version_separator "3" "-")"
+S="${WORKDIR}/$(replace_version_separator "4" "" "${MY_P}")"
+
+DESCRIPTION="Digital DJ tool using QT 4.x"
+HOMEPAGE="http://mixxx.sourceforge.net";
+SRC_URI="mirror://sourceforge/mixxx/${MY_P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+DEPEND="$(qt4_min_version 4.3)
+ media-sound/madplay
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/audiofile
+ media-libs/libsndfile
+ media-libs/libsamplerate
+ media-libs/libid3tag
+ =media-libs/portaudio-19*
+ virtual/glu
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )
+ djconsole? ( media-libs/libdjconsole )
+ ffmpeg? ( media-video/ffmpeg
+ media-sound/gsm
+ media-libs/libdc1394
+ sys-libs/libraw1394
+ media-libs/libdts
+ media-libs/a52dec )
+ ladspa? ( media-libs/ladspa-sdk )"
+
+RDEPEND="${DEPEND}
+ dev-lang/perl"
+
+DEPEND="${DEPEND}
+ sys-apps/sed
+ dev-util/scons
+ dev-util/pkgconfig"
+
+IUSE="alsa jack ladspa djconsole hifieq exbpm exrecord"
+
+pkg_setup() {
+ if use jack; then
+ if ! built_with_use media-libs/portaudio jack; then
+ eerror "To have jack support, you need to compile portaudio"
+ eerror "with USE=\"jack\"!"
+ die
+ fi
+ fi
+ # we need qt4 with opengl and qt3support
+ if ! built_with_use x11-libs/qt qt3support; then
+ eerror "You need to compile qt4 with USE="\"qt3support\"!"
+ die
+ elif ! built_with_use x11-libs/qt opengl; then
+ eerror "You need to compile qt4 with USE="\"opengl\"!"
+ die
+ fi
+}
+
+src_unpack() {
+ unpack "${A}"
+ cd "${S}"
+ # use our own CXXFLAGS/CFLAGS
+ esed_check -i \
+ -e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CCFLAGS = Split(\"\"\" \
+ ${CFLAGS} \"\"\"))/" \
+ -e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CXXFLAGS = ' ${CXXFLAGS} ')/" \
+ src/SConscript
+}
+
+src_compile() {
+ myconf=""
+ ! use ladspa; myconf="ladspa=$?"
+ myconf="${myconf} ffmpeg=0"
+ ! use djconsole; myconf="${myconf} djconsole=$?"
+ ! use hifieq; myconf="${myconf} hifieq=$?"
+ ! use exbpm; myconf="${myconf} experimentalbpm=$?"
+ ! use exrecord; myconf="${myconf} experimentalrecord=$?"
+ myconf="${myconf} prefix=${D}/usr"
+
+ mkdir -p "${D}/usr"
+ einfo "selected options: ${myconf}"
+ tc-export CC CXX
+ scons ${myconf} || die "scons failed"
+}
+
+src_install() {
+ mkdir -p "${D}/usr"
+ scons ${myconf} install || die
+ dodoc README Mixxx-Manual.pdf
+}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2008-01-02 13:26:07 UTC (rev 1083)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2008-01-04 10:55:57 UTC (rev 1084)
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit eutils qt4 subversion
+inherit exteutils qt4 subversion toolchain-funcs
DESCRIPTION="Digital DJ tool using QT 4.x"
HOMEPAGE="http://mixxx.sourceforge.net";
@@ -66,31 +66,32 @@
src_unpack() {
subversion_src_unpack
cd "${S}"
- # fix qt4 include path mess
- epatch "${FILESDIR}/${P}-qt4_paths.patch"
- # use our own CXXFLAGS
- sed -i -e "s:-pipe -O3 -pipe:${CXXFLAGS}:" src/SConscript || die
+ # use our own CXXFLAGS/CFLAGS
+ esed_check -i \
+ -e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CCFLAGS = Split(\"\"\" \
+ ${CFLAGS} \"\"\"))/" \
+ -e "0,/\(^env.Append.*\)/s//\1\nenv.Append(CXXFLAGS = ' ${CXXFLAGS} ')/" \
+ src/SConscript
}
src_compile() {
- local myconf=""
- use ladspa && myconf="ladspa=1"
- use ffmpeg && myconf="${myconf} ffmpeg=1"
- use djconsole && myconf="${myconf} djconsole=1"
- use hifieq && myconf="${myconf} hifieq=1"
- use exbpm && myconf="${myconf} experimentalbpm=1"
- use exrecord && myconf="${myconf} experimentalrecord=1"
+ myconf=""
+ ! use ladspa; myconf="ladspa=$?"
+ ! use ffmpeg; myconf="${myconf} ffmpeg=$?"
+ ! use djconsole; myconf="${myconf} djconsole=$?"
+ ! use hifieq; myconf="${myconf} hifieq=$?"
+ ! use exbpm; myconf="${myconf} experimentalbpm=$?"
+ ! use exrecord; myconf="${myconf} experimentalrecord=$?"
+ myconf="${myconf} prefix=${D}/usr"
- unset QTDIR
mkdir -p "${D}/usr"
- scons \
- prefix="${D}/usr" \
- ${myconf} \
- || die "scons failed"
+ einfo "selected options: ${myconf}"
+ tc-export CC CXX
+ scons ${myconf} || die "scons failed"
}
src_install() {
mkdir -p "${D}/usr"
- scons prefix="${D}/usr" install || die
+ scons ${myconf} install || die
dodoc README Mixxx-Manual.pdf
}