Permalink
Browse files

more revisions

  • Loading branch information...
1 parent 743303c commit 3b2bf4213fc6e4874f824099c419fcb710e5f9d8 @nightmorph committed Apr 7, 2013
@@ -1,6 +1,7 @@
+AUX Makefile.patch 3834 SHA256 362aa9f953a698ec198b7d67f2eb4d75a00f0e3df7499a79f520bf1b855f8d6c SHA512 b33ab4fca42913705ef3ebf396f4b7ed7c0e6c9829b11ee0e00b4471af89ad5aae5ecb0411fbbee80e236cbf15c140b41d0088cb867de038a8864cc6a36275d6 WHIRLPOOL 64446ba2c19c5bf0d84b9792a02c28ccabbe41b98fd345afbd8bcf3b95e9f927cc964a87af2cb915cb9e5b8dfff9ea0ef0bea00068e0d727599694ee23be7653
AUX pd-extended.desktop 175 SHA256 f0de25eb235a18cf12e69d97465e25327d76e90460bfdcaf180be9e45ee5ff2f SHA512 7cd517a9460aeaa1267a2d53329a9ba0a51dfd832c2174b7f106424e009d3313f1cd17aee572077000626e604a1d326a7f949f36a5ae0a58e45693eb4ed58bd9 WHIRLPOOL 5a2fe68fb73c92245159854ef22cf810fbe8e9ccaea6173f5d271a8eae25db7ffbe34ce2304950d58e05f338781b09a02c483d501cac7ba3d3564784b77457e2
DIST Pd-0.42.5-extended.tar.gz 32882125 SHA256 809769fe010daaea63d6bc8fb249ed4735327e2283481d45390892c3d90c4902
DIST Pd-extended_0.43.4-source.tar.bz2 32429500 SHA256 087f23cbc955b308c8e1b9bbc37746d96837f96c6c3c7a199f52ee47d625bf87 SHA512 19f9f80c3fbc04d6ae3f38b60b8580bb6c5d34956d313d7cc45a65f620a61f7b11c0e7d79cdc7860f35b58616e47fc90355e4ffe51b86d4fe7e5c0ee9f6e80c3 WHIRLPOOL 756e61c26439d2affba0bbc091619e30dc7c28ee45acebe042bac2d48d6169344b5aae44e2a5752dc4656acc291850a8613c5f2b24b3ed364b19fd6f696eb91f
EBUILD pd-extended-0.42.5.ebuild 3001 SHA256 48ef28f4e1f58b8da72e9331c04d391e6e58b5fca0871f098e64d492ccb1e063 SHA512 7c7ffa4f13a88f8dda1bae011a9f4130c691fad199f66f6ea9cf777d022720f5aa89a5b071aca1054a480f7cb6678e9febb51160e639af002924a8740da237fb WHIRLPOOL aae540f80db098f4a5ab93cf3b26c01be0f6437938c2c1b13771a820d71e7fa262a22513345a197b6d692e4f48522b5c5be4aa6f864c7aa18da0bbb6c7bc0b46
-EBUILD pd-extended-0.43.4.ebuild 3024 SHA256 860ada1334620e1a7c73b745e4d2e5f20e6844855e76f9067b523927c05077e9 SHA512 d77f0d461d25152d95f3158a61fc84428a9b7813297a3ac2960a87ef724d9480fd8b4f5e09db897d245820e0128c0f8ef1875b1a8071aad78f241c9e6ef26277 WHIRLPOOL cf9c1a6e69547bf8cdc47bea5481b6f6cad16def05ee9db922491cbeee5c0d1f0ce29c9f0061a9fcbf041314c07d11a81c7ef7f61957aa0a4b4a8d0566f20845
+EBUILD pd-extended-0.43.4.ebuild 3205 SHA256 965150a0df292d5ac4b1e1fb992974edcbf18fe760e6d2266e56943c4cd51739 SHA512 9f59a7281e581a84547820389f36faccc4334acaec30fc37a7dc930abf70d6bb34a0a671f78b53a91ca1fe90b7e914174a7e4e73d094b35014dcca896cd272ed WHIRLPOOL 28b67f7781a7b24716dfb5e8994a095b87022f92416794f9ef8174a0eac0e30f031e35da4f06662713e6eb7bad5de4f37c760a3abbde585c1f773868cdbe2b41
MISC metadata.xml 255 SHA256 3723af98d6f375d3d5484602ddbcee0c4124feb2f74eb119ccf1db17a3b867fc SHA512 2c0d2df3a48238565436f3503209c7e3f87c2b5f1491fee29a490b3fb47dd6785ac5595f8d212c33043a59568c1244831ee78755fa02d8ce7612e64d9c4656f8 WHIRLPOOL bb9ebde3494c8a0319dc8a69cb075a22ed005a96d550f3e80caa0306daa488de595a5c07f871ac8c54e2e3e80091540580c8ef34b33fd5d657ca2a8527f8044d
@@ -0,0 +1,67 @@
+--- Makefile.orig 2012-12-12 12:00:16.000000000 -0800
++++ Makefile 2013-04-07 13:12:25.000000000 -0700
+@@ -54,7 +54,7 @@
+
+ PD_INCLUDE = $(PD_PATH)/include
+ # where to install the library, overridden below depending on platform
+-prefix = /usr/local
++prefix = /usr
+ libdir = $(prefix)/lib
+ pkglibdir = $(libdir)/pd-externals
+ objectsdir = $(pkglibdir)
+@@ -87,7 +87,7 @@
+ OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer
+ CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS)
+ LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT)
+- LUACFLAGS += -I/usr/include/lua # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
+ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ LIBS += -lc
+ STRIP = strip -x
+@@ -109,7 +109,7 @@
+ LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
+ # if the 'pd' binary exists, check the linking against it to aid with stripping
+ LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
+- LUACFLAGS += -I/usr/include/lua # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
+ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ LIBS += -lc
+ STRIP = strip -x
+@@ -135,7 +135,7 @@
+ OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+ CFLAGS +=
+ LDFLAGS += -Wl,--export-dynamic -shared
+- LUACFLAGS += -I/usr/include/lua # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
+ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ LIBS += -lc
+ STRIP := $(NDK_TOOLCHAIN_BASE)/bin/arm-linux-androideabi-strip \
+@@ -151,8 +151,8 @@
+ OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
+ CFLAGS += -fPIC -threepic
+ LDFLAGS += -Wl,--export-dynamic -shared -fPIC
+- LUACFLAGS += -I/usr/include/lua5.1 # lua is named differently on every platform, check this and change it to fit
+- LIBS += -llua5.1 # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
++ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ LIBS += -lc
+ STRIP = strip --strip-unneeded -R .note -R .comment
+ DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
+@@ -168,7 +168,7 @@
+ CFLAGS += -fPIC
+ LDFLAGS += -Wl,--export-dynamic -shared -fPIC
+ LIBS += -lc
+- LUACFLAGS += -I/usr/include/lua # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
+ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ STRIP = strip --strip-unneeded -R .note -R .comment
+ DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
+@@ -184,7 +184,7 @@
+ CFLAGS += -fPIC
+ LDFLAGS += -Wl,--export-dynamic -shared -fPIC
+ LIBS += -lc
+- LUACFLAGS += -I/usr/include/lua # lua is named differently on every platform, check this and change it to fit
++ LUACFLAGS += -I/usr/include # lua is named differently on every platform, check this and change it to fit
+ LIBS += -llua # lua is named differently on every platform, check this and change it to fit
+ STRIP = strip --strip-unneeded -R .note -R .comment
+ DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
inherit autotools eutils flag-o-matic versionator
@@ -17,12 +17,13 @@ KEYWORDS="~amd64 ~x86"
Linux="+hid +pdp +gem2pdp +iem16"
# oscx is deprecated by the mrpeach external
externals="-oscx +zexy"
-IUSE_PD_EXTERNALS="apple arraysize +bassemu~ +boids +bsaylor chaos +creb +cxc
- +earplug~ +ekext +ext13 +flashserver +flatgui +flib +freeverb~ +ggee grh
- +hcs +iem +iemlib jasch_lib +loaders log +mapping +markex +maxlib miXed
+IUSE_PD_EXTERNALS="apple arraysize +bassemu +boids +bsaylor chaos +creb +cxc
+ +earplug +ekext +ext13 +flatgui +freeverb +ggee grh
+ +hcs +iemlib jasch_lib +loaders-hexloader +loaders-libdir +loaders-tclpd
+ +loaders-pdlua log +mapping +markex +maxlib miXed
+mjlib +moocow +moonlib +motex +mrpeach +pan +pdcontainer +pddp +pdogg
- pduino +plugin~ +pmpd +sigpack +smlib testtools +tof unauthorized +vanilla
- +vbap +windowing"
+ pduino +plugin +pmpd +sigpack +smlib testtools +tof unauthorized +vanilla
+ +vbap +windowinga"
IUSE="+alsa debug fftw +jack portaudio
${IUSE_PD_EXTERNALS} ${Linux} ${externals}"
@@ -36,7 +37,7 @@ DEPEND="dev-lang/tcl
fftw? ( sci-libs/fftw )
hcs? ( dev-libs/libusb )
jack? ( media-sound/jack-audio-connection-kit )
- loaders? ( dev-lang/lua )
+ loaders-pdlua? ( dev-lang/lua )
pdogg? ( media-libs/libogg
media-libs/libvorbis )
portaudio? ( media-libs/portaudio )
@@ -47,12 +48,16 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}/pd/"
src_prepare() {
+ #cd "${WORKDIR}/${PN}/externals/loaders/pdlua"
+ #epatch "${FILESDIR}/Makefile.patch"
cd "${S}/pd/"
+ #cd "${S}"
eautoreconf
}
src_configure() {
cd "${S}/pd/src"
+ #cd "${S}/src"
econf \
$(use_enable alsa) \
$(use_enable jack) \
@@ -62,7 +67,8 @@ src_configure() {
}
src_compile() {
- cd "${S}/pd/src"
+ cd "${S}/src"
+ #cd "${S}/pd/src"
emake
# build externals in $IUSE
@@ -86,16 +92,17 @@ src_compile() {
src_install() {
# install pd-extended
- cd "${S}/pd/src"
- emake DESTDIR="${D}" prefix="/usr" install
-
+ #cd "${S}/pd/src"
+ cd "${S}/src"
+ emake DESTDIR="${D}" prefix="/usr" install || die "initial install failed"
+
+ cd "${S}/src"
# install private headers for developers
- insinto /usr/include
- doins "${S}/pd/src/m_pd.h" "${S}/pd/src/m_imp.h" "${S}/pd/src/g_canvas.h" \
- "${S}/pd/src/t_tk.h" "${S}/pd/src/s_stuff.h" "${S}/pd/src/g_all_guis.h"
+ insinto /usr/include/pdextended || die "can't insinto"
+ doheader m_pd.h m_imp.h g_canvas.h s_stuff.h g_all_guis.h || die "no doheader"
# install externals
- cd "${WORKDIR}/${PN}/externals"
+ cd "../../externals"
for external_useflag in ${IUSE_PD_EXTERNALS}; do
local external=${external_useflag#[+-]}
if use ${external}; then

0 comments on commit 3b2bf42

Please sign in to comment.