Revision: 2818
Author: alchemist
Date: 2013-12-11 17:16:33 +0100 (Wed, 11 Dec 2013)
Log Message:
-----------
media-libs/juce-1.53: fixed multilib and jucer builds
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/juce/ChangeLog
trunk/overlays/proaudio/media-libs/juce/Manifest
trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/juce/files/
trunk/overlays/proaudio/media-libs/juce/files/juce-1_53_release-Jucer.make.patch
Modified: trunk/overlays/proaudio/media-libs/juce/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/ChangeLog 2013-12-10 20:53:40 UTC
(rev 2817)
+++ trunk/overlays/proaudio/media-libs/juce/ChangeLog 2013-12-11 16:16:33 UTC
(rev 2818)
@@ -4,6 +4,9 @@
*juce-1.53 (10 Dec 2013)
+ 11 Dec 2013; Xavier Miller <[email protected]>: fixed multilib
+ and jucer builds
+
10 Dec 2013; Xavier Miller <[email protected]>: changed SRC_URI to
GittHub release tags; fixed dependencies for ~amd64 (removed the
emul-linux dep)
Modified: trunk/overlays/proaudio/media-libs/juce/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/Manifest 2013-12-10 20:53:40 UTC
(rev 2817)
+++ trunk/overlays/proaudio/media-libs/juce/Manifest 2013-12-11 16:16:33 UTC
(rev 2818)
@@ -1,4 +1,5 @@
+AUX juce-1_53_release-Jucer.make.patch 1440 SHA256
3627232a8b960bf0397441b22ec3c5724b9b6308cceedd78373cc5a2e2a4eee3 SHA512
7a355b1124eabc90cccdda33557cae2c79d1bffa035ea72c40f543cb483ee1efd756c6d9d30675df43e12cb50fb4eebf05fcd25cd84d478ea1faee55f7e4882e
WHIRLPOOL
c1383fbeb7fdc6bf08a521bc8b0651abc83305a502e85f45a1f43fc55bdb24d2d31e7b4fc7349e4ab7602bf1bc4d08fd0a4bce9e26d296a0d5e06873e4ce2a0f
DIST JUCE-1_53_release.tar.gz 6519860 SHA256
abe83241d93a4cd29315137ec60dd60c5879f8dd7a5c86a4c6e400d2a04d05a0 SHA512
fec465bda335075948fef6dcdfd41e2dcbce2160c60b74f1eaa5958a31c0195d21d720a262f5f7b38a0ca0af4816573775a357d21f16fe3768b3140f25172020
WHIRLPOOL
4f8b410b057bb43220e95d037b7dca52201015317368b1a7abefa703ac822c2a1760168bd9bc2fa14d26ab5680cb8d1075547187d21b6d1c8e80420a83f07078
-EBUILD juce-1.53.ebuild 2912 SHA256
bf6f90d297df5f63181327c97629d6092a5d532267b0dae2a19b65882822289e SHA512
d353b5226bd694480f19cd15963b86b129a3d1cc444c9c581a97582bc598f5f617ba9bad20e3c046d3e7835d6c2dc2289397687269d3564d18a1542addb36de3
WHIRLPOOL
cab9a3c71e001b3cf9473ffd3f865b867adb681219c9686ea4d9f5878c0ef155827708a5774a311f6ae2d3af8197bf4f242030db48f8bb81ff8816cc8207748e
-MISC ChangeLog 986 SHA256
1ffb5f57f4f0f2f0d0c84e089da437936eafa9aaf6b1fca548807ae46678f62b SHA512
d0cdcaa31e11b0b70632e39196040a2a3649ed8eb1b971c9e8fe0721b9385687733ede354736643588fd21a5493c7687a922fa59bf90242854722013b59aae13
WHIRLPOOL
f3600d7f7bc1b056c5dd101085601a433afdcf6919e57bf151a3c1f9122b1e4033c0a37b19359e728ad5bae4fffeee8a567541d8b82d45641340b57498951343
+EBUILD juce-1.53.ebuild 2939 SHA256
cd7d2685fb9d04ec449771e08cae9ea9b08ebe3c04e6491f926413aff2fa6445 SHA512
7a00c500c507bd02969fff765ae06e1e2a00f8667076d0406b8cae9d9e1603f1d6bd5df2777bfc502d0e47799faa37cc61732892c2c8969526fa0838019d549e
WHIRLPOOL
64fb9152e2db4a78e4e696cebfbe18a18bc5bcab8b5c95ad5d7af0f4db6aaaa9b42f6919219697df198523dde8a37aca2469f0ae14f3a6bc8505726d447f4b5d
+MISC ChangeLog 1078 SHA256
06009edf27fc9486bb54affbbaa77acb021ce4a38fc35ada7da27082d313eb42 SHA512
3b602ab0900e3a19106278270a3e73a8a9bfee68211af721501db098e6b646a8493dd99380a77fb41a7183107cc453a075733f47dcedcf6b1d5ff98ad3c9748d
WHIRLPOOL
9260e2223cc24d2387a9c7e17dfce33439b96622c071b0f907eac2dbc971c78b5aad7bcf7439b11d5735e522bdeff20dc4faafc1a5f68c1807c15ddc403dd8d6
MISC metadata.xml 364 SHA256
c1ed97527d6d1cf7e0af8f1a5b3e25209bbe30278583db2d99c3d50af7f50e32 SHA512
b86c0f88675e254fb1714645993f18b27e3a0c2bddb55285a693359de385d34f8383de835bcfab6018840aea520c3edfc0369a3dcb4a07e174a986348a2f8f85
WHIRLPOOL
cc358a6bec4b1369096cb044dec0fcd01f54aefca711fba3f65fc6528d8b9ff24d17c66f2bda0f50b39771c1f065b1bb27c36d1bce089d26c35f6668ab113915
Added:
trunk/overlays/proaudio/media-libs/juce/files/juce-1_53_release-Jucer.make.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/juce/files/juce-1_53_release-Jucer.make.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/juce/files/juce-1_53_release-Jucer.make.patch
2013-12-11 16:16:33 UTC (rev 2818)
@@ -0,0 +1,20 @@
+--- "extras/the jucer/build/linux/Jucer.make" 2011-06-24 12:43:38.000000000
+0200
++++ "extras/the jucer/build/linux/Jucer.make" 2013-12-11 11:13:57.442912983
+0100
+@@ -16,7 +16,7 @@
+ CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I
"/usr/include" -I "/usr/include/freetype2"
+ CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -march=native -D_DEBUG -ggdb
+ CXXFLAGS += $(CFLAGS)
+- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/"
-L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound
++ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../bin"
-lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lXext -lasound -ldl
+ LDDEPS :=
+ RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I
"/usr/include/freetype2"
+ TARGET := jucer
+@@ -31,7 +31,7 @@
+ CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I
"/usr/include/freetype2"
+ CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O2 -march=native
+ CXXFLAGS += $(CFLAGS)
+- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -L"/usr/X11R6/lib/"
-L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound
++ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/X11R6/lib/"
-L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lXext
-lasound -ldl
+ LDDEPS :=
+ RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I
"/usr/include/freetype2"
+ TARGET := jucer
Modified: trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild 2013-12-10
20:53:40 UTC (rev 2817)
+++ trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild 2013-12-11
16:16:33 UTC (rev 2818)
@@ -19,19 +19,24 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug xinerama flac vorbis opengl jucer demo"
+IUSE="debug xinerama flac vorbis opengl jucer demo multilib"
RDEPEND="=media-libs/freetype-2*
>=media-libs/alsa-lib-0.9
flac? ( media-libs/flac )
vorbis? ( media-libs/libvorbis )
- >=x11-libs/libX11-1.0.1-r1"
+ >=x11-libs/libX11-1.0.1-r1
+ multilib? ( app-emulation/emul-linux-x86-xlibs )"
DEPEND="${RDEPEND}
app-arch/unzip
x11-libs/libXinerama
opengl? ( media-libs/freeglut )"
+src_prepare() {
+ epatch "${FILESDIR}/juce-1_53_release-Jucer.make.patch"
+}
+
src_compile() {
# demo fails with --as-needed
filter-ldflags -Wl,--as-needed --as-needed
@@ -50,20 +55,20 @@
cd "${S}"/Builds/Linux
# debug
einfo "Running CFLAGS=${CFLAGS} make ${myconf} ..."
- make ${myconf} || die "compiling the juce library failed"
+ emake ${myconf}
if use demo; then
cd "${S}/extras/JuceDemo/Builds/Linux"
- make ${myconf} || die "compiling the juce demo failed"
+ emake ${myconf}
fi
if use jucer; then
cd "${S}/extras/the jucer/build/linux"
- make ${myconf} || die "compiling jucer failed"
+ emake ${myconf}
fi
- # compile 32bit too on amd64
- if use amd64; then
+ # compile 32bit too on amd64/multilib
+ if use multilib; then
einfo "Compiling 32bit lib too..."
# move 32bit lib out of the way
@@ -72,16 +77,16 @@
rm -rf "${S}"/bin/*
# and compile the lib again
cd "${S}"/Builds/Linux
- make clean || die
+ emake clean
CFLAGS="${CFLAGS} -m32"
# debug
- einfo "Running CFLAGS=${CFLAGS} make ${myconf} ..."
- make ${myconf} || die
+ einfo "Running CFLAGS=${CFLAGS} emake ${myconf} ..."
+ emake ${myconf}
fi
}
src_install() {
- if use amd64; then
+ if use multilib; then
insinto /usr/lib32
doins bin/libjuce.a
insinto /usr/lib64
