| [proaudio] [2836] media-libs/juce: added introjucer USE flag and build ; filtered " -march=native" CFLAGS + add needed libraries in the |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2836
Author: alchemist
Date: 2014-01-01 20:19:11 +0100 (Wed, 01 Jan 2014)
Log Message:
-----------
media-libs/juce: added introjucer USE flag and build ; filtered "-march=native" CFLAGS + add needed libraries in the
Makefiles
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/juce_linux_NativeIncludes.h.patch
Removed Paths:
-------------
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 2014-01-01 00:30:43 UTC (rev 2835)
+++ trunk/overlays/proaudio/media-libs/juce/ChangeLog 2014-01-01 19:19:11 UTC (rev 2836)
@@ -3,7 +3,11 @@
# $Header: $
-*juce-1.53 (12 Dec 2013)
+*juce-1.53 (01 Jan 2014)
+ 01 Jan 2014; Xavier Miller <alchemist@xxxxxxxxxxxxx>: added introjucer
+ USE flag and build ; filtered "-march=native" CFLAGS + add needed
+ libraries in the Makefiles
+
12 Dec 2013; Xavier Miller <alchemist@xxxxxxxxxxxxx>: don't patch if USE=-jucer
11 Dec 2013; Xavier Miller <alchemist@xxxxxxxxxxxxx>: fixed multilib
Modified: trunk/overlays/proaudio/media-libs/juce/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/Manifest 2014-01-01 00:30:43 UTC (rev 2835)
+++ trunk/overlays/proaudio/media-libs/juce/Manifest 2014-01-01 19:19:11 UTC (rev 2836)
@@ -1,5 +1,5 @@
-AUX juce-1_53_release-Jucer.make.patch 1440 SHA256 3627232a8b960bf0397441b22ec3c5724b9b6308cceedd78373cc5a2e2a4eee3 SHA512 7a355b1124eabc90cccdda33557cae2c79d1bffa035ea72c40f543cb483ee1efd756c6d9d30675df43e12cb50fb4eebf05fcd25cd84d478ea1faee55f7e4882e WHIRLPOOL c1383fbeb7fdc6bf08a521bc8b0651abc83305a502e85f45a1f43fc55bdb24d2d31e7b4fc7349e4ab7602bf1bc4d08fd0a4bce9e26d296a0d5e06873e4ce2a0f
+AUX juce_linux_NativeIncludes.h.patch 427 SHA256 d9f3700241309c7ff0b58fd725f33c1d6fce9e45f9d09ecedab36e43205974b1 SHA512 e42447243f6de87b909ad878078a9306f9812ec4b3ccd53576d7b30c4bcfe3a5154314042b94dd4b7f55debfcdadd2376354857f9f5e42373a0ac7698d5b5c26 WHIRLPOOL c6e0cdd04995b1f5983694ae84a54a80e67e272b369dae467beb21ae64061ff23734a51d3be3638c72d6249153105bbe1820e8ca81c90e464c048c01f3b28cef
DIST JUCE-1_53_release.tar.gz 6519860 SHA256 abe83241d93a4cd29315137ec60dd60c5879f8dd7a5c86a4c6e400d2a04d05a0 SHA512 fec465bda335075948fef6dcdfd41e2dcbce2160c60b74f1eaa5958a31c0195d21d720a262f5f7b38a0ca0af4816573775a357d21f16fe3768b3140f25172020 WHIRLPOOL 4f8b410b057bb43220e95d037b7dca52201015317368b1a7abefa703ac822c2a1760168bd9bc2fa14d26ab5680cb8d1075547187d21b6d1c8e80420a83f07078
-EBUILD juce-1.53.ebuild 2964 SHA256 6764158c8663f625c576bcd0ccbc61c1be8fcddba7bfcad706d47186654b2e17 SHA512 21a81fffc99f54d82dc1acd8cd777ad90651c38e1edb99898c782ebe46e25f9768f43bf33a6773f28d3e260144d06134c84483c9e6214d08d0de69d01148d406 WHIRLPOOL 771d887f0b85bdcf6fb9422022d44b27b935265f54ce1484e99639a5bc33380ae9238bdba192b328dcd52dd276f0ec3ab22ce65d016c1631a11d4c4c05152738
+EBUILD juce-1.53.ebuild 3843 SHA256 0e060a1481d8f8e03a61ebed8d48e91eddff51e6435fa7a76e5b41d2df01dcb3 SHA512 ee73a03aa43d12d768f2fe594046a8896498d6f18c65f67ffd9bd068436d99599223cc4f20d46a69d742aa757ab620cd69b8b5be55fe8f4c2936654d91e1a11e WHIRLPOOL 238ba9549374c82138f90b17250f11cd4f76edc8d7031a4ca3c22f2a70d27128d30b374cb08d8b274429b1537d2bdb248af8ae0e7b1baa5de44e92cac23a5513
MISC ChangeLog 1161 SHA256 79b97f9d75d54e316f846f15c966e54ba8a26f689fcc7133e2ac5d7a3bcb27a2 SHA512 398a020b30655218c15bd525a36e2147e60996bc36c4a3a5ad028970c7e313b5cb35ae790d9827f0e1741f3cbfa1a7cb6b140f8d88a7ac26c93a957e5ab8dc17 WHIRLPOOL d28afe28d2981c17c47e88ed081eec7b333eaa042162f23a05db7a0867c0778c63e86112c843bcaa2fb9084b4fd17d6e4cf72a5c0a29ee75607484e9318a10a2
MISC metadata.xml 364 SHA256 c1ed97527d6d1cf7e0af8f1a5b3e25209bbe30278583db2d99c3d50af7f50e32 SHA512 b86c0f88675e254fb1714645993f18b27e3a0c2bddb55285a693359de385d34f8383de835bcfab6018840aea520c3edfc0369a3dcb4a07e174a986348a2f8f85 WHIRLPOOL cc358a6bec4b1369096cb044dec0fcd01f54aefca711fba3f65fc6528d8b9ff24d17c66f2bda0f50b39771c1f065b1bb27c36d1bce089d26c35f6668ab113915
Deleted: 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 2014-01-01 00:30:43 UTC (rev 2835)
+++ trunk/overlays/proaudio/media-libs/juce/files/juce-1_53_release-Jucer.make.patch 2014-01-01 19:19:11 UTC (rev 2836)
@@ -1,20 +0,0 @@
---- "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
Added: trunk/overlays/proaudio/media-libs/juce/files/juce_linux_NativeIncludes.h.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/files/juce_linux_NativeIncludes.h.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/juce/files/juce_linux_NativeIncludes.h.patch 2014-01-01 19:19:11 UTC (rev 2836)
@@ -0,0 +1,12 @@
+--- src/native/linux/juce_linux_NativeIncludes.h 2011-06-24 12:43:38.000000000 +0200
++++ src/native/linux/juce_linux_NativeIncludes.h 2013-12-31 12:54:03.936677238 +0100
+@@ -60,6 +60,9 @@
+ #include <sys/prctl.h>
+ #include <signal.h>
+
++// For Introjucer
++#include <unistd.h>
++
+ /* Got a build error here? You'll need to install the freetype library...
+ The name of the package to install is "libfreetype6-dev".
+ */
Modified: trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild 2014-01-01 00:30:43 UTC (rev 2835)
+++ trunk/overlays/proaudio/media-libs/juce/juce-1.53.ebuild 2014-01-01 19:19:11 UTC (rev 2836)
@@ -19,7 +19,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="debug xinerama flac vorbis opengl jucer demo multilib"
+IUSE="debug xinerama flac vorbis opengl jucer introjucer demo multilib"
RDEPEND="=media-libs/freetype-2*
>=media-libs/alsa-lib-0.9
@@ -34,9 +34,18 @@
opengl? ( media-libs/freeglut )"
src_prepare() {
- if use jucer; then
- epatch "${FILESDIR}/juce-1_53_release-Jucer.make.patch"
+ if use introjucer; then
+ epatch "${FILESDIR}/juce_linux_NativeIncludes.h.patch"
fi
+
+ einfo "Removing -march=native in makefiles..."
+ find . '(' -name Makefile -o -name jucer_ProjectExport_Make.h -o -name \*.make ')' -exec grep -q '\-march=native' '{}' ';' -print -exec sed -i -e 's/-march=native//g' '{}' ';' || die
+
+ einfo "Removing -mwindows in makefiles..."
+ find . '(' -name Makefile -o -name jucer_ProjectExport_Make.h -o -name \*.make ')' -exec grep -q '\-mwindows' '{}' ';' -print -exec sed -i -e 's/-mwindows//g' '{}' ';' || die
+
+ einfo "Adding LDFLAGS in makefiles..."
+ find . '(' -name Makefile -o -name jucer_ProjectExport_Make.h -o -name \*.make ')' -exec grep -q '\-lasound' '{}' ';' -print -exec sed -i -e 's/-lasound/-lXext -lasound -ldl/g' '{}' ';' || die
}
src_compile() {
@@ -54,17 +63,24 @@
sed -i -e "s:// #define JUCE_OPENGL 1: #define JUCE_OPENGL 1:" juce_Config.h
fi
+ if use introjucer; then
+ einfo "Building The Introjucer"
+ cd "${S}/extras/Introjucer/Builds/Linux"
+ emake ${myconf}
+ fi
+
+ einfo "Building JUCE libraries..."
cd "${S}"/Builds/Linux
- # debug
- einfo "Running CFLAGS=${CFLAGS} make ${myconf} ..."
emake ${myconf}
if use demo; then
+ einfo "Building demos..."
cd "${S}/extras/JuceDemo/Builds/Linux"
emake ${myconf}
fi
if use jucer; then
+ einfo "Building Jucer..."
cd "${S}/extras/the jucer/build/linux"
emake ${myconf}
fi
@@ -82,7 +98,6 @@
emake clean
CFLAGS="${CFLAGS} -m32"
# debug
- einfo "Running CFLAGS=${CFLAGS} emake ${myconf} ..."
emake ${myconf}
fi
}
@@ -98,6 +113,7 @@
fi
use demo && dobin "extras/JuceDemo/Builds/Linux/build/JuceDemo"
use jucer && dobin "extras/the jucer/build/linux/build/jucer"
+ use introjucer && dobin "extras/Introjucer/Builds/Linux/build/Introjucer"
insinto /usr/share/doc/"${P}"
doins docs/*.html docs/*.css docs/*.txt
mv docs/images "${D}"/usr/share/doc/"${P}"