root
9 years ago
parent
a2192bd8c0
commit
19d895dd0c
@ -0,0 +1,118 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild,v 1.2 2015/01/20 12:08:33 teiresias Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
MY_P=${P/speech-/speech_}
|
||||
PATCHSET="r3"
|
||||
|
||||
DESCRIPTION="Speech tools for Festival Text to Speech engine"
|
||||
HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
|
||||
SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
|
||||
http://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
|
||||
|
||||
LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="nas X"
|
||||
|
||||
RDEPEND="
|
||||
nas? ( media-libs/nas )
|
||||
X? ( x11-libs/libX11
|
||||
x11-libs/libXt )
|
||||
>=media-libs/alsa-lib-1.0.20-r1
|
||||
!<app-accessibility/festival-1.96_beta
|
||||
!sys-power/powerman
|
||||
>=sys-libs/ncurses-5.6-r2
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S="${WORKDIR}/speech_tools"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_SUFFIX="patch"
|
||||
epatch
|
||||
|
||||
sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
|
||||
main/siod_main.cc || die
|
||||
|
||||
#WRT bug #309983
|
||||
sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
|
||||
"${S}"/config/systems/sparc_SunOS5.mak || die
|
||||
|
||||
# Fix underlinking, bug #493204
|
||||
epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local CONFIG=config/config.in
|
||||
sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
|
||||
if use nas; then
|
||||
sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
|
||||
${CONFIG} || die
|
||||
fi
|
||||
if ! use X; then
|
||||
sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
|
||||
fi
|
||||
econf
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dolib.so lib/libest*.so*
|
||||
|
||||
dodoc "${S}"/README
|
||||
dodoc "${S}"/lib/cstrutt.dtd
|
||||
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r lib/example_data
|
||||
|
||||
insinto /usr/share/speech-tools
|
||||
doins -r config base_class
|
||||
|
||||
insinto /usr/share/speech-tools/lib
|
||||
doins -r lib/siod
|
||||
|
||||
cd include || die
|
||||
insinto /usr/include/speech-tools
|
||||
doins -r *
|
||||
dosym /usr/include/speech-tools /usr/share/speech-tools/include
|
||||
|
||||
cd ../bin || die
|
||||
for file in *; do
|
||||
[ "${file}" = "Makefile" ] && continue
|
||||
dobin ${file}
|
||||
dstfile="${D}/usr/bin/${file}"
|
||||
sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
|
||||
${dstfile} || die
|
||||
sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
|
||||
${dstfile} || die
|
||||
sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
|
||||
${dstfile} || die
|
||||
|
||||
# This just changes LD_LIBRARY_PATH
|
||||
sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
|
||||
done
|
||||
|
||||
cd "${S}" || die
|
||||
exeinto /usr/$(get_libdir)/speech-tools
|
||||
for file in `find main -perm /111 -type f`; do
|
||||
doexe ${file}
|
||||
done
|
||||
|
||||
#Remove /usr/bin/resynth as it is broken. See bug #253556
|
||||
rm "${D}/usr/bin/resynth" || die
|
||||
|
||||
# Remove bcat (only useful for testing on windows, see bug #418301).
|
||||
rm "${D}/usr/bin/bcat" || die
|
||||
rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
|
||||
}
|
||||
@ -1,18 +1,17 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
|
||||
AUX gcr-3.14.0-race-building.patch 982 SHA256 ef1d1fc3573c1bdea69e38ae3a8a48d00c1a388cb38a06c78dc61757a850d57d SHA512 5c1d1531cfd936c9068ebb9a287c4ca28af8ee02b20564001379679dddd500492993caff44c7a347d9c9b869ef0b1a2c6f4aeb675adb634f9e2070dde4d006d5 WHIRLPOOL ef9538d676ce274729c3a761305a738dc018d1ea8ad0b6a6af0c0ddbed4277fab131f547ccd98da14305ae93df2ca05fed639bd78a7c00df4ab0400108b51013
|
||||
DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
|
||||
DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
|
||||
EBUILD gcr-3.10.1.ebuild 1907 SHA256 e2031af77b388bd8aa37f72b260a761231d16963149eeebaaeecd7c82d872fb7 SHA512 f99a36fb3330e1a0adaed37091f9c499d0d158cb2258fbfe2269fd0a82d503e61256bce126ddd7db64316d20ec60246a27d543d5effb0ee16d35e87243c981aa WHIRLPOOL 6ab46d68017f0589f75b10077c8c9449810ab2ac6f4ff73ccc84cae977a3fe7f24c2c99907018d537ef30e963dd457ab5ca866e3d70e243fdc4b24b6356905b0
|
||||
EBUILD gcr-3.12.2.ebuild 2044 SHA256 6e75e041167163595dd7ef852c10e04260f7563572d47fb4a4723e80442a85fe SHA512 a4af50a6d674dd2de05c5e98ca3991e388bb219b9a66a70a63145db64f13a1c29118d5b594f82f74993a640b99420dea1b035005af1c4a7774596ceee33dc12e WHIRLPOOL 24871fb99e03c481b07e25dfa5172da19a77f1d48a049173b663854423cd6a3ed78382fbcc3d4bebaf8ba2cb698e68a1beb52106b244d1bfe5bb98a10698fbc4
|
||||
EBUILD gcr-3.14.0.ebuild 2048 SHA256 325d316e76232c69c111d9eb6fbd262003c993d9c0076ddb14c93cce0580c072 SHA512 290e816930ea74d38696aeb710c934ccdb652c3f8fba3aea810f49fee7443c7fae263c01d3c116ef1890b4186a7351f0f401140612a574af310672af85d4aa6c WHIRLPOOL 3f7d9ea804be57ad99cfc4892c9d3fa2d3e7ec194bd770ccecae54adf876b1e7c9883dc316e30239be03fba03ef5545318087837c7c2bcd1645c7fddbe2c1cc8
|
||||
MISC ChangeLog 5868 SHA256 b85b7703748c4cd172e8195a67692764c1cee1d1f510e825e344bf5e00fad299 SHA512 34f4953a213c0e36e1e378adf5e92b72539d7dc8788b744e5cc84777057be72277759df83e93e79d0921a05bced50665660210254e7649ddbcd9131e0c778745 WHIRLPOOL 08d8d65cca1cdce5a6b051af6be30a6c9a6aef221000557bec11cd75f20bc5d04ce26afa936b212a370bf9b26823c3c8ba8342b49d592fc9e379b60eb46ef86b
|
||||
EBUILD gcr-3.14.0.ebuild 2167 SHA256 1ffb1252771f92c7b1a81b221cd92fe5c3aa8a992c46e8ef95dc5102dd44c77d SHA512 58ef473afcf3eaa85e89b26510a63be34581b9cee451fd24bb93042093abeae2c66527bbf02926deaaa21a4966a363ca9cf086b42c1519e05103ce1556271b0b WHIRLPOOL 083bf199936b4537b37d04dee181415a7f561b5d0e98b3891bdfb2a3e24d3c19364287aaf7e09bef38bf4cf2b10e185043d30fece39b1392350c5a0c88c92279
|
||||
MISC ChangeLog 6059 SHA256 2c70a34fe206fe5a60bc93d3ff189956533956ac7a58d70c7d7c28acd3444ea1 SHA512 5d3e73988de306572e3b91f3cc2f956b0cc063e06fd61c6a440d6e3cf62466663ea0a8886d247f7081456b12006fe6ddd8a83d5ff144dfdeb202c66cea1a0237 WHIRLPOOL 05852b15260429fb7260aeedd809806e7f87b1acc0283bde3ac0cb77acc105e7dddf42e7686c1b2be45bc20d799b421ef1ae36124b46b2a85819c772055b68df
|
||||
MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlSPaCsACgkQ1fmVwcYIWAa5jwCg2XylGy+dgrWZXJD25LdmAUaH
|
||||
ucEAoJ0ZxtOqKYn95z0yH4nCgiqQTumC
|
||||
=+AIg
|
||||
iEYEAREIAAYFAlS+Oq8ACgkQCaWpQKGI+9QMHgCfWlsyH1q5MWjQ5f+9KWCpAyGq
|
||||
GK4An0fjc3T4PmaOQnkXwYYPABa4ar7p
|
||||
=krIn
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
From 58de2d787a31175b26687b9a228da0fb1cea5809 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Henriksson <andreas@fatal.se>
|
||||
Date: Mon, 29 Sep 2014 20:28:00 +0000
|
||||
Subject: gcr: Fix race building gdbus-codegen header and source
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=737622
|
||||
|
||||
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
|
||||
index 0834c67..59f32b7 100644
|
||||
--- a/gcr/Makefile.am
|
||||
+++ b/gcr/Makefile.am
|
||||
@@ -161,12 +161,12 @@ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS)
|
||||
$(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
|
||||
gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \
|
||||
mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c
|
||||
-
|
||||
-gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
|
||||
$(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
|
||||
gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
|
||||
mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
|
||||
|
||||
+gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
|
||||
+
|
||||
pkgconfig_DATA += \
|
||||
gcr-base-$(GCR_MAJOR).pc
|
||||
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.10.1.ebuild,v 1.11 2014/04/21 10:28:28 ago Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
VALA_MIN_API_VERSION="0.20"
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit gnome2 vala virtualx
|
||||
|
||||
DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
|
||||
HOMEPAGE="https://developer.gnome.org/gcr/"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+"
|
||||
SLOT="0/1" # subslot = suffix of libgcr-3
|
||||
IUSE="debug gtk +introspection vala"
|
||||
REQUIRED_USE="vala? ( introspection )"
|
||||
KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=app-crypt/gnupg-2
|
||||
>=app-crypt/p11-kit-0.19
|
||||
>=dev-libs/glib-2.32:2
|
||||
>=dev-libs/libgcrypt-1.2.2:0=
|
||||
>=dev-libs/libtasn1-1:=
|
||||
>=sys-apps/dbus-1
|
||||
gtk? ( >=x11-libs/gtk+-3:3 )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.34 )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<gnome-base/gnome-keyring-3.3
|
||||
"
|
||||
# gcr was part of gnome-keyring until 3.3
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/gobject-introspection-common
|
||||
dev-util/gdbus-codegen
|
||||
>=dev-util/gtk-doc-am-1.9
|
||||
>=dev-util/intltool-0.35
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
# eautoreconf needs:
|
||||
# dev-libs/gobject-introspection-common
|
||||
|
||||
src_prepare() {
|
||||
# Disable stupid flag changes
|
||||
sed -e 's/CFLAGS="$CFLAGS -g"//' \
|
||||
-e 's/CFLAGS="$CFLAGS -O0"//' \
|
||||
-i configure.ac configure || die
|
||||
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
DOCS="AUTHORS ChangeLog HACKING NEWS README"
|
||||
gnome2_src_configure \
|
||||
$(use_with gtk) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable vala) \
|
||||
$(usex debug --enable-debug=yes --enable-debug=default) \
|
||||
--disable-update-icon-cache \
|
||||
--disable-update-mime
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
Xemake check
|
||||
}
|
||||
@ -1,3 +1,13 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
EBUILD rex-client-9999.ebuild 945 SHA256 7211983bef4fe418a87363460b34567ac186480bce31c6a59088c0b382402800 SHA512 312f5face1661a38a3711baa292651d1cc0d83acb46fd67ed4635f30b739f79a659e95ab6842e4fee7146067b481c7809ee4dd09e7533f998fef5b809c21abc4 WHIRLPOOL 919e372a3289ae6f2fe131300eb2dfb9240799dfd33bb1ae2c42058868aae7d9b920ad87fe0dd80c7f7f40f3dd117320d29e3ec59ba748ce892130cb84d85c51
|
||||
MISC ChangeLog 599 SHA256 6495043e779fb37cf804201a7137af463d9aa40731d21708f3337c3b41dbf012 SHA512 be80274bf232f22547e1a69871f66c59cc81635785214ede5c8ff226e202f4292d9e35cdf9bae96b6a428933ec2f98d1c390e873bcd1089fddb79ca43bbf483f WHIRLPOOL b0a9dc907e56d6ded3489bba06d639347497213325a9f4dab76db45d8ca6fa94d3a3b49a664a06314548fe793c0a5ca4bf8d2ec10ca31e26938c61757528cb21
|
||||
MISC metadata.xml 226 SHA256 8e33be85f46d4e2cc0a00d6402d2f068e7c6f6a1ba9feba41069d9d10afc72d9 SHA512 4482224bfbc75bcbcad70ff0cdcdbbf0f0918c5227830f57e3a78015de1ef39360d5f29fee98f11dc5b5836adf194072963fb79c7ba87a13236890ef6b0ac7a7 WHIRLPOOL c678429a56e866fcf2c9f92f124569f9b3d36cb7569d072495244f04db437d2302c9d13a826bf277d5994917d78ccd1426954cc0e1dbd21e3f4295597d1e5a52
|
||||
MISC ChangeLog 683 SHA256 a8deeffdd4fcaec22c8118f31d9231a108e14aad54c6e666d9ff3452ec32e83d SHA512 e91316df1e447430599c6a57d8a00445ee569ff8edcc0d93a1e749a6da4c114673a799c6969fafe9e375c43cbd7b670929630f8f9a9c1f9b358960419740495f WHIRLPOOL afbf29639cb7550bd63f1e5489c44532b54dc23ff6acb8ae1fb51de7564889970b9bc51609eab39b7887fd633d94e32f149a8b42471467bc568f45c7e284ac4c
|
||||
MISC metadata.xml 212 SHA256 ee3f9b4c9d0e78859354433a6821624cbafc2c394e8b9a3125b9a815bcbed0d9 SHA512 f9b7bf626dd7e34a070c7b0e848d3a5743a8931c4b9c1e028108aef490ce6b21a37c52765aebd691be01da6a082507d4b3df4c184d69327f3a1dbd671e144e62 WHIRLPOOL 90ed1d833e558f3e0ed7e9cf9a83e93e4bbdec2d8a0b255dca98d5dcd7b5e481ca763267de24145fc7d243f6382cc797a6b7875ba797a68267d4217aad7e2b9a
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlS+JxsACgkQCaWpQKGI+9RDSQCfcKkukGgB0UKSyG93GA9lJIw6
|
||||
FyoAnRwuE8dLt1IJC4TAk+pqOFxoL1dv
|
||||
=6yph
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,4 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX prefix-chain-setup.in 4973 SHA256 c686b6a4335aaffa518f26c5c0de19159f2f4cafefafc9a6362dd1eaa9d58042 SHA512 6d5509a811a8c63cf0c822dbef07cb800c94c9bb73cb3d5c4fb9f55cf010f4ef60930a1729a18dd1ab17d5e2cc91fda57d22b3a4184976e21a89dbf299f20aab WHIRLPOOL c0645011cc054f6bee4dab2941bd048e422aecc34b5090ab572f63f8c9bcfa2af0bb0328c278d3a33ae68137b8371d453df7b7fd6300df143107c5ee2fa6c3d8
|
||||
EBUILD prefix-chain-setup-0.4-r5.ebuild 659 SHA256 e1303f5d5f59d62a4e5a0cf62ce8ba527bb6a3241e41d2c70ca2b39f334d69cc SHA512 1b8d50fb456256ccd680debecfef3994bc8efd5dc5ac8f944905f5e2e44e11e4ec54735d4409a40b068cda34e54416a62dd09e038e6fbcb4a27312751f1743d9 WHIRLPOOL e5adcdf65d4e4aedbafc2de535d303be28b1559e741debb048759bf388c7211330303e27355c5157828321973291c22c3c8e9138714e99021de58c8c421e734f
|
||||
MISC ChangeLog 1484 SHA256 08a6f7a811d4ae534f3d067cc7d9bf762b73779dfbca1c443bbfd14ab847d3d7 SHA512 e9a12e99857b3bb22fabece6fee7609fec1e852dae8cdddeed97225e9a2531c7cc0b9b3b495b8609cdc9db6861d68c55fc3aba90ba30ccc5093311f8d5777366 WHIRLPOOL 16139a316104e40bbe46f358d7bb3749c7d763110248f04f1489e0a3b1c9b6763dc7708a65409ac44e1d8538a3848a812620ece52facde451314aed32d52c3ac
|
||||
MISC metadata.xml 220 SHA256 c9f383a1048a577a634b834b74291e72658dc45d4fd0c9cbae411fcf6907ae7d SHA512 750d34391e581122926c3159053e9f90c66d4ac43403ec637c9310b9688ec53357f49b1360ca6faf49f7a65ba6bb7ffc818ace58770d053ece937a4d9ef47f4e WHIRLPOOL b7ed7d67d303c49d9263c03b92e2aeddc4c043b17ccbd1691eb4c2a2fae8616d5161352d3d2db834b6e9ba42fb1c06d0304fa3a1739d57125ae5035127d3598d
|
||||
MISC ChangeLog 1566 SHA256 d16bc55408e0c2d99fc83fe70c374312f6b8f05abf19a948f51ff74af2f21bbc SHA512 eddb0024e9d9d6720a63cc3552290b1d6254dc66be3e7f50aa30b5980c3f9625a6dc71b4afde440e5beafdad954064e41fc9ec0846aee2cbfbe83e9fd659d629 WHIRLPOOL 08ddd55cfd3c2a7db491c349e0178cdcd95b7b79f30a50990d805cbb272e79ccdd46cb92551470a07b59075eb0a197ca19fbde5308d46853c5ffeff281bf2c0f
|
||||
MISC metadata.xml 159 SHA256 9f4e165acd1a7bdc5c8ccdb4a40a2e969e056b8463bfe94a1b2e29cc4ef62af4 SHA512 dea494c8d7e5c95051ffe93b7d507732ed69dca5aeb2dd4c4c5250dd268e8818f1a96f41e478e0ab66e3f54e00bcccbfb621d4b386724e1a643186278f9bcd9a WHIRLPOOL fcfffa139b0ba0a23600d20232bd83c05c80564830d3ec75f4e43ee84c735cf1e733dd28bff711cc91e4eda0709033938fc7de247d6621d8adb224b306d2e992
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlS+JzkACgkQCaWpQKGI+9RQCgCfcOByzKj3qYfZZhMTQHLAhFQX
|
||||
FiEAnjO+uCAf6hRrccTx158F6pS6AKQc
|
||||
=FrRF
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/fugitive/fugitive-2.2.ebuild,v 1.1 2015/01/20 13:21:11 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vim-plugin
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/tpope/vim-fugitive.git"
|
||||
else
|
||||
inherit vcs-snapshot
|
||||
SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
|
||||
fi
|
||||
|
||||
DESCRIPTION="vim plugin: a git wrapper for vim"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
|
||||
LICENSE="vim"
|
||||
|
||||
VIM_PLUGIN_HELPFILES="${PN}.txt"
|
||||
|
||||
RDEPEND="dev-vcs/git"
|
||||
@ -1,16 +1,15 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST editline-0.2.1.0.tar.gz 43928 SHA256 83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1 SHA512 ea3ab9e12c8e35bfc4e050bf66bdd1ab94cce8dd3fa91b455a8bdefc872f702f74717a511bc3b8d6bade663f20cff493d98a642379a5a84a569241c79150a0b3 WHIRLPOOL 7f215b4a3fb3996052e0bdcdb6cda0c3b0aa1543907bb41e6e9f6d6d900accb446312c2632a97e8d45b7b3d5b17d3b0d8df4c9f7c0cff439764706c5de6ae7dc
|
||||
AUX editline-0.2.1.1-ghc-7.8.patch 564 SHA256 5032c65916f172ec5ff9ec47e40bffcf6b03ace00bffee880d819eb059416171 SHA512 e3c9742d854294a77e6a646dc7d2b4fe96c9d2ad6d9c789278dfe7a6b20b55ee27da732f630211bcb705e5443cce1de716762dbe5f0b1c01fd5457a771cb8a93 WHIRLPOOL 4f12832a5539dd893ca6b2d5c6de8110de96814c026f9884ac1c75e68536e78343e101266f22636081f35348d9b8083fc8b704091916e41d9a8f851b8f0e209e
|
||||
DIST editline-0.2.1.1.tar.gz 47240 SHA256 9fb64f89a38ad847de7d3537e9dff75d8fcebd12fc789a175cc892a0e4873f80 SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6 WHIRLPOOL 4b254eabcf6edb0d20a2bf7546b628656fd1dc5009cf1684c74b8871fa3d0402f3acdde3ec00bc69c9d43c44d2c6432fc92b8429ec7b87f28976c2407ecee909
|
||||
EBUILD editline-0.2.1.0.ebuild 608 SHA256 87882238727f7acb0d06495aece974654b9afc083db95040d4c3683278957a3d SHA512 83c1a761626d9303e22ee8fedc36d6511f8e11842668e6e6b40f5f3672837615097a96dd7d0a614878e7128b62cee6f78c2dacc80d7dc6b857dfb72bb863c2ed WHIRLPOOL fb8d4bdeb7e68065b0897d2368ba6d0eb9699a108aae442e38bc983e19ba835d241c9b636f0cc1dd8a16ee22f54b1f7e026c677aa6e8ab7d2eb3ac604eac87b0
|
||||
EBUILD editline-0.2.1.1.ebuild 682 SHA256 88ff52a4d71ee342bde17599b02329481940ab07740a35d1eaa297c4a75bb50b SHA512 946f44d2ce13535d39294820bab02880dc9eca1a4da924bbcfecf3f75980dd029519d0ed3c26dca27e05e6cb14715dff15324140ad45279a77c2fccd72d03e86 WHIRLPOOL c92d6d8f82d4cb586e4936f1ff6a70de5a703503272364cbf3288c8eb3cc5f28994dfdde919de723178b5485e476607764c220d01428b574c834b2d82498dd53
|
||||
MISC ChangeLog 796 SHA256 e3580e1082b6adeea257ab7d464a55ad89da3f8dc4028bff9106ecd3735f2790 SHA512 fd8246860b8b4c9cf3dbc51c9f5eda39192c8bef9d5e11b92104474523aecbdb51a899936f14bb46ff56a5baa80af75b1b997894c584bf44692ff837963977c1 WHIRLPOOL 92dfd0ce8ccfc55c27ba28bf206fd93cb5bd0309e48fd54e3c72e891d912b582cde0538fd467b9a9304d44cddb1f0cc992e243ce8774df4cda4516c0d8388f15
|
||||
EBUILD editline-0.2.1.1.ebuild 786 SHA256 8c6a10b95073c31956df6ad53a589e81e57f50c416a852aedef17f71fd57413f SHA512 b8ded8b44279669dbd09026a3b9bbaddb3f142df486535d661a7ea5f1069df6edee5f7706fb4db260531f8fd77e469858f3abcede993409dd76d1e2518005ac7 WHIRLPOOL f1d0965bda90656b088a718a586d58b22a599ba126a8bed1ea714a8c3fab77e6b18b7cdc0d69e8b48385ecba63a9591afa3311f0485903389311f2df80c2ceb8
|
||||
MISC ChangeLog 997 SHA256 0bc02fceb3f198c26b62a1d3e2fca923583865998394249d41fd18aaff11a9ea SHA512 e01d26ea5a00dd2339600be39fbb901980913e9c86b52ea21a0edb00ee221dbf88f6d6ca76c035746fcc489034bb0e8a839768760610aa8e16bfcbc31476ed50 WHIRLPOOL 125c3d463ab5841a8b117efbd40061fe0a4fa08f46d1cfab7ba983438e7899f34369284768fce9feb509a15d2475783f1ae7dfd4f8aa03ae18ffc52c27d8ed4b
|
||||
MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlPSIPQACgkQcaHudmEf86q49gCfedhZDXKexFAV/6m/osHRZZaO
|
||||
3MUAoIV3OxTIyf0IDPaqRh3lPXbfmOr/
|
||||
=kuY4
|
||||
iEYEAREIAAYFAlS9hXMACgkQcaHudmEf86q7DgCeKwQtGEk0o9XEGRCX/hccGmI/
|
||||
oZMAn1XxfSM228zeAzL5+BwDhz/1T7+c
|
||||
=919f
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/editline-0.2.1.0.ebuild,v 1.3 2014/07/25 09:16:37 slyfox Exp $
|
||||
|
||||
CABAL_FEATURES="lib profile haddock"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Bindings to the editline library (libedit)"
|
||||
HOMEPAGE="http://code.haskell.org/editline"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-lang/ghc-6.6.1
|
||||
dev-libs/libedit"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.2"
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/System/Console/Editline/Readline.hsc b/System/Console/Editline/Readline.hsc
|
||||
index 1ea9d6c..3b95b59 100644
|
||||
--- a/System/Console/Editline/Readline.hsc
|
||||
+++ b/System/Console/Editline/Readline.hsc
|
||||
@@ -173,7 +173,7 @@ import Foreign.Marshal.Array ( mallocArray, peekArray0, pokeArray0 )
|
||||
import Foreign.C.Types ( CInt(..), CChar, CFile )
|
||||
import Foreign.C.String ( newCString, peekCString, withCString,
|
||||
castCharToCChar, castCCharToChar )
|
||||
-import GHC.Handle ( fdToHandle )
|
||||
+import GHC.IO.Handle.FD ( fdToHandle )
|
||||
|
||||
{-# CFILES HsReadline_cbits.c #-}
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.5.ebuild,v 1.1 2015/01/19 20:42:58 monsieurp Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-pkg-2
|
||||
|
||||
MY_PN=apache-${PN%%-bin}
|
||||
MY_PV=${PV/_alpha/-alpha-}
|
||||
MY_P="${MY_PN}-${MY_PV}"
|
||||
MY_MV="${PV%%.*}"
|
||||
|
||||
DESCRIPTION="Project Management and Comprehension Tool for Java"
|
||||
SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
|
||||
HOMEPAGE="http://maven.apache.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
# TODO: Needs further resolution:
|
||||
#
|
||||
# - https://bugs.gentoo.org/show_bug.cgi?id=472850
|
||||
# - https://bugs.gentoo.org/show_bug.cgi?id=477436
|
||||
#
|
||||
DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )
|
||||
|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
|
||||
dev-java/aopalliance:1
|
||||
dev-java/avalon-framework:4.1
|
||||
dev-java/commons-cli:1
|
||||
dev-java/commons-io:1
|
||||
dev-java/javax-inject:0
|
||||
dev-java/jsoup:0
|
||||
dev-java/jsr250:0
|
||||
dev-java/juel:0
|
||||
dev-java/osgi-core-api:0
|
||||
java-virtuals/interceptor-api:0
|
||||
java-virtuals/servlet-api:2.4"
|
||||
|
||||
RDEPEND=">=virtual/jdk-1.6
|
||||
>=virtual/jre-1.6
|
||||
${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
MAVEN=${PN}-${SLOT}
|
||||
MAVEN_SHARE="/usr/share/${MAVEN}"
|
||||
|
||||
java_prepare() {
|
||||
rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
|
||||
|
||||
chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
|
||||
|
||||
# Symlink jars.
|
||||
cd lib || die
|
||||
java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
|
||||
has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
|
||||
has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
|
||||
has_version dev-java/log4j:0 && java-pkg_jar-from log4j
|
||||
}
|
||||
|
||||
# TODO: We should use jars from packages, instead of what is bundled.
|
||||
src_install() {
|
||||
dodir "${MAVEN_SHARE}"
|
||||
|
||||
cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
|
||||
|
||||
java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
|
||||
java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
|
||||
|
||||
dodoc NOTICE README.txt
|
||||
|
||||
dodir /usr/bin
|
||||
dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
|
||||
|
||||
# See bug #342901.
|
||||
echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
|
||||
doenvd "${T}/25${MAVEN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect maven update mvn-${SLOT}
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect maven update
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
# ChangeLog for dev-lang/go-bootstrap
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go-bootstrap/ChangeLog,v 1.1 2015/01/20 03:39:35 williamh Exp $
|
||||
|
||||
*go-bootstrap-1.4.1 (20 Jan 2015)
|
||||
|
||||
20 Jan 2015; William Hubbs <williamh@gentoo.org> +go-bootstrap-1.4.1.ebuild,
|
||||
+metadata.xml:
|
||||
Initial commit of go-bootstrap for bug #536960.
|
||||
go-bootstrap is intended only as a build time dependency used to build
|
||||
newer versions of go.
|
||||
See https://golang.org/s/go15bootstrap for how this works.
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST go1.4.1.src.tar.gz 10921282 SHA256 3d9bb27ad4be51f60dc44f3d0026036ef07142797b1df1b5ae816277e6c31bb3 SHA512 47cbd67cdca8d67e8d09fee6d9a9fd5ddfa65f59413bd583c83b27c598f7b1b23e51e894888c10202bada560a16758eb847bff963d77726724aefecaea5cf644 WHIRLPOOL 0e63fce9674204c79dafad2daea1b8e097370ae7a5b5ee0e463235925cec4a3e74fa0980de8fe6fa1adbc072c2921cef494c5eafe251fe4e26a0f1586bd217e0
|
||||
EBUILD go-bootstrap-1.4.1.ebuild 2066 SHA256 5c5ff9487daf58cb540674f4f1251bad65153d90bd5fa1797dd81b8a9d8e7db4 SHA512 b3c9e44ea9cdc43fa1376642182b9164792f11dcc75661e330a439384344a334c62a2e5e049839c1d5b6a4e2ce008154dc93ed1cc97bcd11267f1eb78f03e629 WHIRLPOOL 780b64ce3a0f722cd1599756d7708a029cf6ba23617763bb690216d56a9fd134d9d1d2200818cb3965c7ac35e7abe638af8fc56f76d99b06e24f0061345fd6f7
|
||||
MISC ChangeLog 557 SHA256 fc8e308a7226f0e211b588cb8ae4850646f95e452b37d7a195d55bddcb2b70e0 SHA512 2633652f16d0d495ad8fb4d8081c2440c8e24988715d3c7be447a7b7f32db93422303fe12074a741905c82b0b0d903836bf8d2d4dc31bb3957d8f3fbc0560986 WHIRLPOOL 92af527ae05c5df8d4a43ccac35acd128ddf6f15633ccb7c800cc3e4b6d5c521376486543798dbb4fdf715e240e03ba9a25c2f57f921687e762d4dd2e1fabde1
|
||||
MISC metadata.xml 467 SHA256 3f0e04fc62e643abd20c541d2739faa9ac03a72add79b873ad5e705dbb154820 SHA512 ce1062602cc5c6391154c9ea7d0c2c4b68e91a904fae059867a77e54d74d2e4a648176d12606ab558a509c3a3dc45b533258ae7ba9b15fa138d5faf6a4d8069b WHIRLPOOL 5fac459140bc77aa26d20c57103be488e690d04ac9c1868fbb2314a4ec84a06b9a5ded3a4ee5860c74d777e9f5cf450da4e5d22b94cb7841e7ba7dda0c741643
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlS9zgcACgkQblQW9DDEZTjZGACgsDs0N7u4SB+C4AR50PW9R1k6
|
||||
LbQAoKRFSZIVgY6uKUVdidtMIPYX4NkE
|
||||
=6lPq
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,83 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go-bootstrap/go-bootstrap-1.4.1.ebuild,v 1.1 2015/01/20 03:39:35 williamh Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
|
||||
# Upstream only supports go on amd64, arm and x86 architectures.
|
||||
KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
|
||||
|
||||
DESCRIPTION="Version of go compiler used for bootstrapping"
|
||||
HOMEPAGE="http://www.golang.org"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
# The go tools should not cause the multilib-strict check to fail.
|
||||
QA_MULTILIB_PATHS="usr/lib/go1.4/pkg/tool/.*/.*"
|
||||
|
||||
# The go language uses *.a files which are _NOT_ libraries and should not be
|
||||
# stripped.
|
||||
STRIP_MASK="/usr/lib/go1.4/pkg/linux*/*.a
|
||||
/usr/lib/go1.4/pkg/freebsd*/*.a /usr/lib/go1.4/pkg/darwin*/*.a"
|
||||
|
||||
S="${WORKDIR}"/go
|
||||
|
||||
src_prepare()
|
||||
{
|
||||
sed -i -e 's/"-Werror",//g' src/cmd/dist/build.c
|
||||
}
|
||||
|
||||
src_compile()
|
||||
{
|
||||
export GOROOT_FINAL="${EPREFIX}"/usr/lib/go1.4
|
||||
export GOROOT="$(pwd)"
|
||||
export GOBIN="${GOROOT}/bin"
|
||||
if [[ $CTARGET = armv5* ]]
|
||||
then
|
||||
export GOARM=5
|
||||
fi
|
||||
tc-export CC
|
||||
|
||||
cd src
|
||||
./make.bash || die "build failed"
|
||||
}
|
||||
|
||||
src_test()
|
||||
{
|
||||
cd src
|
||||
PATH="${GOBIN}:${PATH}" \
|
||||
./run.bash --no-rebuild --banner || die "tests failed"
|
||||
}
|
||||
|
||||
src_install()
|
||||
{
|
||||
dodir /usr/lib/go1.4
|
||||
exeinto /usr/lib/go1.4/bin
|
||||
doexe bin/*
|
||||
insinto /usr/lib/go1.4
|
||||
doins -r lib pkg src
|
||||
fperms -R +x /usr/lib/go1.4/pkg/tool
|
||||
}
|
||||
|
||||
pkg_postinst()
|
||||
{
|
||||
# If the go tool sees a package file timestamped older than a dependancy it
|
||||
# will rebuild that file. So, in order to stop go from rebuilding lots of
|
||||
# packages for every build we need to fix the timestamps. The compiler and
|
||||
# linker are also checked - so we need to fix them too.
|
||||
ebegin "fixing timestamps to avoid unnecessary rebuilds"
|
||||
tref="usr/lib/go1.4/pkg/*/runtime.a"
|
||||
find "${EROOT}"usr/lib/go1.4 -type f \
|
||||
-exec touch -r "${EROOT}"${tref} {} \;
|
||||
eend $?
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>williamh@gentoo.org</email>
|
||||
<name>William Hubbs</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
This package is only necessary until gccgo supports go-1.4. It
|
||||
will be removed as soon as stable gcc supports this.
|
||||
It is here so that >=dev-lang/go 1.5 can use it to bootstrap.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,93 @@
|
||||
From e67a9ba456bc7f4b6b8c4899179d6b7a2863d592 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
|
||||
Date: Tue, 20 Jan 2015 08:12:41 +0100
|
||||
Subject: [PATCH] configure: Add flag to force on or off SSH support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Remove an automagic dependency on libgit2's SSH support.
|
||||
|
||||
Signed-off-by: Rémi Cardona <remi@gentoo.org>
|
||||
---
|
||||
configure.ac | 64 ++++++++++++++++++++++++++++++++++++------------------------
|
||||
1 file changed, 38 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1bd96bc..61744db 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -79,32 +79,44 @@ dnl ===========================================================================
|
||||
dnl Check for libgit2 ssh support
|
||||
dnl ===========================================================================
|
||||
|
||||
-AC_MSG_CHECKING([for libgit2 ssh support])
|
||||
-
|
||||
-cflags_save="${CFLAGS}"
|
||||
-libs_save="${LIBS}"
|
||||
-
|
||||
-CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
|
||||
-LIBS="${LIBGIT2_GLIB_LIBS}"
|
||||
-
|
||||
-AC_TRY_RUN([
|
||||
- #include <git2.h>
|
||||
- int
|
||||
- main(int argc, const char *argv[])
|
||||
- {
|
||||
- git_libgit2_init ();
|
||||
- return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
|
||||
- }
|
||||
-],[
|
||||
- AC_MSG_RESULT([yes])
|
||||
- git_ssh=yes
|
||||
-],[
|
||||
- AC_MSG_RESULT([no])
|
||||
- git_ssh=no
|
||||
-])
|
||||
-
|
||||
-CFLAGS="${cflags_save}"
|
||||
-LIBS="${libs_save}"
|
||||
+AC_ARG_ENABLE([ssh],
|
||||
+ AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
|
||||
+ [enable_ssh=$enableval],
|
||||
+ [enable_ssh="auto"])
|
||||
+
|
||||
+git_ssh=no
|
||||
+
|
||||
+if test "x$enable_ssh" != "xno"; then
|
||||
+ AC_MSG_CHECKING([for libgit2 ssh support])
|
||||
+
|
||||
+ cflags_save="${CFLAGS}"
|
||||
+ libs_save="${LIBS}"
|
||||
+
|
||||
+ CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
|
||||
+ LIBS="${LIBGIT2_GLIB_LIBS}"
|
||||
+
|
||||
+ AC_TRY_RUN([
|
||||
+ #include <git2.h>
|
||||
+ int
|
||||
+ main(int argc, const char *argv[])
|
||||
+ {
|
||||
+ git_libgit2_init ();
|
||||
+ return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
|
||||
+ }
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ git_ssh=yes
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ git_ssh=no
|
||||
+ if test "x$enable_ssh" = "xyes"; then
|
||||
+ AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
|
||||
+ fi
|
||||
+ ])
|
||||
+
|
||||
+ CFLAGS="${cflags_save}"
|
||||
+ LIBS="${libs_save}"
|
||||
+fi
|
||||
|
||||
if test "x$git_ssh" = "xyes"; then
|
||||
LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
|
||||
--
|
||||
2.2.1
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild,v 1.2 2015/01/20 10:35:32 pacho Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
GCONF_DEBUG="no"
|
||||
PYTHON_COMPAT=( python{3_3,3_4} )
|
||||
VALA_MIN_API_VERSION="0.22"
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit autotools eutils gnome2 python-r1 vala
|
||||
|
||||
DESCRIPTION="Git library for GLib"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="python ssh +vala"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libgit2-0.21.0:=
|
||||
>=dev-libs/glib-2.28.0:2
|
||||
>=dev-libs/gobject-introspection-0.10.1
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}] )
|
||||
ssh? ( dev-libs/libgit2[ssh] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/gtk-doc-am-1.11
|
||||
virtual/pkgconfig
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Make libgit2[ssh] dep non-magic, upstream bug #743236
|
||||
epatch "${FILESDIR}/${PN}-0.22.0-automagic-ssh.patch"
|
||||
|
||||
eautoreconf
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
$(use_enable python) \
|
||||
$(use_enable ssh) \
|
||||
$(use_enable vala)
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libltdl/libltdl-2.4.5.ebuild,v 1.1 2015/01/19 23:30:31 polynomial-c Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit multilib-minimal
|
||||
|
||||
MY_P="libtool-${PV}"
|
||||
|
||||
DESCRIPTION="A shared library tool for developers"
|
||||
HOMEPAGE="http://www.gnu.org/software/libtool/"
|
||||
SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="static-libs"
|
||||
# libltdl doesn't have a testsuite.
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!<sys-devel/libtool-2.4.3-r2:2
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
DEPEND="app-arch/xz-utils"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/libltdl"
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
--enable-ltdl-install \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# While the libltdl.la file is not used directly, the m4 ltdl logic
|
||||
# keys off of its existence when searching for ltdl support. #293921
|
||||
#use static-libs || find "${D}" -name libltdl.la -delete
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
# ChangeLog for dev-perl/Data-Types
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-Types/ChangeLog,v 1.1 2015/01/20 13:21:40 chainsaw Exp $
|
||||
|
||||
*Data-Types-0.90.0 (20 Jan 2015)
|
||||
|
||||
20 Jan 2015; Tony Vroon <chainsaw@gentoo.org> +Data-Types-0.90.0.ebuild,
|
||||
+metadata.xml:
|
||||
Initial commit. Ebuild inspired by the work of Mark "castiel" Burazin, herd
|
||||
review by Andreas "dilfridge" Huettel & Vladimir "Civil" Smirnov.
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-Types/Data-Types-0.90.0.ebuild,v 1.1 2015/01/20 13:21:40 chainsaw Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR="DWHEELER"
|
||||
MODULE_VERSION="0.09"
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Validate and convert data types."
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
SRC_TEST=do
|
||||
DEPEND="virtual/perl-Module-Build
|
||||
test? ( virtual/perl-Test-Simple )"
|
||||
@ -0,0 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST Data-Types-0.09.tar.gz 8527 SHA256 b2296fdcf9addc8e8fc39e15eb2c3d81145f6355258438bc783b12b02c41cb81 SHA512 9d337457a5714b298f514f841c27a252fa5af6aa145061266b948bf6ffabab3966a2910d09b80b7ee138822ffa2661971813676a60295ad62b57aa122ec9b8a2 WHIRLPOOL b7778a0853a995fb1f74232e47089c42f17660f3a43537a5a733c7eca8dfacc09c088d1f2c86ab64c521839f7e8b8c771e96ef6268afd5d4d433eef830332ecb
|
||||
EBUILD Data-Types-0.90.0.ebuild 475 SHA256 e07e424361020939df4692328afef9ebca215d53bc0786ae10ae5a455fd43fa3 SHA512 8c1c25bbdeb1a8e046ae2883d29e19e64107dc68179770475e4944bbf14452b1351fdb4fc5e5c454ab176faa41551f3101df57bfc7b5d5f2f17fd8542c9a05dd WHIRLPOOL a0639327c2397a90758b9997ef781b4ed44e79f3d9235885df24d2bee24a920bcf631ee749d7fdcbd7e1c8f4fa9724b33064934130d5070d96e4fda5cfbc4523
|
||||
MISC ChangeLog 486 SHA256 ff0ce2e216f7363ae1dccbc2cc6bd660319a6a28ff6eace733b4958694ec9959 SHA512 c3d2a03e67ace9dd8950388f3ab786efe16b6d8a48cd75210467f761b593a4c8509fc4b04004c8281d0468fd5a28fd823fef62218a9d968e47725e0bd0345c8b WHIRLPOOL 2cc7c79c4847d3c0dd085ae8a34c59e9f9e847d2d9aa403d9db3e36230cc92ef73a58f584125f71b86491bf12b3e3f84f24be92c7ed07609b6f0edb632188c76
|
||||
MISC metadata.xml 392 SHA256 28c298de9603a9d883f3e149853378d21581bea00c1d0a9fabea2e3bd11a6ce6 SHA512 f0051c8040eb7db6eea9d4993a253bf5582b329e72cba0cdc8740fc650d451688851d8db1f6e5c4efd772dbf4a565b4c47f657d33a1796c0103eca04ecb8cf33 WHIRLPOOL 7ab762797e7749dabafe31024c17f56efc6c332eb9a15f3001f244ad1b1e600814ac84a9fb5009532f21f1b50ddec70ad5ae96f6aa404fd7fab6e50edd7fcf4e
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlS+VnkACgkQp5vW4rUFj5pb2ACgooTpIdrIA8mN069jYrrwHbcl
|
||||
JiwAn2lQrsxgcHu2EhMbSOjVZIkqZSoS
|
||||
=SbB6
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
<maintainer>
|
||||
<email>chainsaw@gentoo.org</email>
|
||||
<name>Tony Vroon</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpan">Data-Types</remote-id>
|
||||
<remote-id type="cpan-module">Data::Types</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,11 @@
|
||||
# ChangeLog for dev-perl/DateTime-Tiny
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Tiny/ChangeLog,v 1.1 2015/01/20 13:30:09 chainsaw Exp $
|
||||
|
||||
*DateTime-Tiny-1.40.0 (20 Jan 2015)
|
||||
|
||||
20 Jan 2015; Tony Vroon <chainsaw@gentoo.org> +DateTime-Tiny-1.40.0.ebuild,
|
||||
+metadata.xml:
|
||||
Initial commit. Ebuild inspired by the work of Mark "castiel" Burazin, herd
|
||||
review by Andreas "dilfridge" Huettel & Vladimir "Civil" Smirnov.
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Tiny/DateTime-Tiny-1.40.0.ebuild,v 1.1 2015/01/20 13:30:09 chainsaw Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR="ADAMK"
|
||||
MODULE_VERSION="1.04"
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A date object, with as little code as possible"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
SRC_TEST=do
|
||||
DEPEND="virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( virtual/perl-Test-Simple )"
|
||||
@ -0,0 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST DateTime-Tiny-1.04.tar.gz 14427 SHA256 68137c8ab3ca2a7f8a5fcea20f94b2f82bc2c7c36bb45063dbd81faadf0c7881 SHA512 da065b983ef7362a3190d1e0758fc071ded7c216c5bbff2aa111b9211b6deffdfa6c17a12ec6aa4c0fc51a091ea753d05c9b00acb4e30f57b6b99a66236de3c1 WHIRLPOOL 137b1907aaa7f9b18bf7398ba058f0718b5e029164811e78f0758e71898518ba7d95d4b175ea2179b314b4c0e4afd4ce87d096deccbcbdc80ce315cf7b118368
|
||||
EBUILD DateTime-Tiny-1.40.0.ebuild 498 SHA256 0fafa4487d51b563de945c815ddfdbd2c9032eb18223049938352c22f8810b68 SHA512 02df0aaf2beccfdee52c4a1d37d20e6d4b385c0679496e3c5998bc327686d0e3d262a53042a30e68b8ff867d1abd4e733bb8f669846e68fca52949d3bdbd965c WHIRLPOOL 349477638dc9e28fb5e1a4528e163426ad8b686b2ab5976d3715a271b019a2341ede3e7e2edca2e70715208e046450e52c5e6d8f608e84ec9d0f885ddc93ffba
|
||||
MISC ChangeLog 498 SHA256 8b47461f0c965545d2a7cde8615e510699662e06740ef22b620e6ca5dc034164 SHA512 40500aedb2ea92979fb25d0ef1ca74f545d22d7bb151073748f1efc63a9f04f76d07d6b724526547f904a627cb10935dfaf42e8bb2447b3e07e776270e0007a1 WHIRLPOOL 5d302404e44d22856d1b25ec0b33edc4ff884f5969ebb10bc15de92b151aaeea6bda949e6935f666dded4ba659e89dc84b395afb5df143515c36a853b27ada12
|
||||
MISC metadata.xml 398 SHA256 bed423cd7bcd86dfab9772c716578f847862d033b024319b6829c240ccfe415e SHA512 78a07d4622defb7d08b5d4102b75408dbf1c2812f925d3dc636b4d7fbb47b8cd7c74fb084912c8da1dd325541cda49909c01066c80c9292d2def506d0ed7ff71 WHIRLPOOL 7ee62327527a87b67ee7b09e7563f08c82f72c9f1e85ecda5ef11beaacbe0aebab72d674bef08fd23ff8258549749e79c383fd834508bef380434959a3851051
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlS+WHYACgkQp5vW4rUFj5rlIgCeMKk8skI+QmSu1X+bjToyYuXB
|
||||
7uYAoL7mjZdPYpE0sMCRcC9plMZLnRfu
|
||||
=ZRsj
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
<maintainer>
|
||||
<email>chainsaw@gentoo.org</email>
|
||||
<name>Tony Vroon</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpan">DateTime-Tiny</remote-id>
|
||||
<remote-id type="cpan-module">DateTime::Tiny</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DNS/Net-DNS-0.810.0.ebuild,v 1.1 2015/01/20 10:08:24 chainsaw Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=NLNETLABS
|
||||
MODULE_VERSION=0.81
|
||||
inherit toolchain-funcs perl-module
|
||||
|
||||
DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="ipv6 test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Digest-MD5
|
||||
dev-perl/Digest-HMAC
|
||||
virtual/perl-Digest-SHA
|
||||
dev-perl/Net-IP
|
||||
virtual/perl-MIME-Base64
|
||||
ipv6? (
|
||||
dev-perl/IO-Socket-INET6
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
virtual/perl-Test-Simple
|
||||
dev-perl/Test-Pod
|
||||
)"
|
||||
|
||||
PATCHES=( ${FILESDIR}/${PN}-0.68-ar.patch )
|
||||
SRC_TEST="do"
|
||||
|
||||
src_prepare() {
|
||||
perl-module_src_prepare
|
||||
mydoc="TODO"
|
||||
# --IPv6-tests requires that you have external IPv6 connectivity
|
||||
# as it connects to 2001:7b8:206:1:0:1234:be21:e31e
|
||||
myconf="${myconf} --no-online-tests --no-IPv6-tests"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake FULL_AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-12.0.3.ebuild,v 1.1 2015/01/19 21:11:13 radhermit Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="a collection of extensions to Distutils"
|
||||
HOMEPAGE="http://pypi.python.org/pypi/setuptools"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="PSF-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
|
||||
)
|
||||
"
|
||||
|
||||
# Force in-source build because build system modifies sources.
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
|
||||
|
||||
python_prepare_all() {
|
||||
# disable tests requiring a network connection
|
||||
rm setuptools/tests/test_packageindex.py || die
|
||||
|
||||
# don't run integration tests
|
||||
rm setuptools/tests/test_integration.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
|
||||
# It tries to sandbox the test in a tempdir
|
||||
HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
|
||||
distutils-r1_python_install
|
||||
}
|
||||
@ -1,8 +1,20 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
|
||||
DIST gettext-3.1.2.gem 224768 SHA256 1ed987d0a46448cfc76617b486ad9a991e0d48501855e49eacb781aa531df6eb SHA512 14fbccf1d853bd58ae3ecbda3188294147404fb8473a54caeac505b93ffa25f96098786bd1171449aa1f0f74c4116e93b5d2f7c0705930dd014b210720667479 WHIRLPOOL 5a31bf87b38370276bf4c61886025f8721a7cb297012fbe6d1947abf82d1d35d779838506f5e56adbdda090a0ae20d4e5c74b9c4a08a4c782998d78b3a7c1768
|
||||
DIST gettext-3.1.4.gem 270848 SHA256 6bc35f2a7ce237caecc83d43d971536c12e3170ab94d7abb44f8da29e45cd63d SHA512 3f8e8eb27436fdddfcc980bbac0a05ceeb98b67a8b181b184faa928c1d9f96bea71d4128a055659843b04da9fb0407532eac4134ae62b435ddea9719d51af20d WHIRLPOOL 20f65ecb13c4df54e102300fb0558c89cf2a33849e1cc0290c40d16c3aae6d13c6289e667d0deb4844214b4d9320cb24554153a9a2713e8d2d05d3b5ed88e5e6
|
||||
DIST gettext-3.1.5.gem 282112 SHA256 c394467105c9370994443769cf99a3af880da9cd11036fc3a47c5766dc10b2bc SHA512 de1f337ae6a4c010735915c7de258048a2cc7d4b649c5f715a9afe2ccaaf68910dc5b86d2da5905fe881baad1b0ec60fe7603b5aaeb6e822816e6fa14e7d1565 WHIRLPOOL cfc9a49b8933fbe2ee61fbd2a19b21f2f13b566882621b210cc48c8beabc9496b7ba0eced6b7c94c25585e2668b557afad512630d34af594e14a0dc8a0a4a0fc
|
||||
EBUILD ruby-gettext-3.1.1.ebuild 1628 SHA256 1b354ff6e8794502e92f2ae90af694c4436336087c3affc242735e309f44c4aa SHA512 1b52efddcd970ba344bd9bb7cfb7fc35b44cd07983cfb4c2254952a01b132bca6f2d14be3f2a095d237de894f4b2a1545c8188341b2beb7a0847bf550df86f84 WHIRLPOOL baa982eab907b0a4c3dcc220a0d04b26a7d79b065f81d09849f9a9bfecc0ec1feaabbf801f3f58e6d0ffa47091c5840bda1aefab49b87c536b42d518244d9094
|
||||
EBUILD ruby-gettext-3.1.2.ebuild 1640 SHA256 66dd02c1724aae689ad64378889db2b02182ed8ef529e2cd313789a0da37466a SHA512 7f806e0d129b68ce8d7adb41c64c13889b94413289d12fb564f7fdd120b5a9bd268ae6ed888be367478da807ac61f69d41d58719952b9fc084a57e0f0097b471 WHIRLPOOL 77e006124ebea87c9f29c2454bbd709270372a53a184254b1f7df2703a25625211c06da7f3495c2bc905f3633ce099451803fe5c23b1add1d0a025cfa660893e
|
||||
EBUILD ruby-gettext-3.1.4.ebuild 1651 SHA256 57b3af644422e49d9e8c1b3f46a02900471bcd29e129a7f442389dea1d970d03 SHA512 d2f59433d6a7989e328374fdbd7d982c75caf7dcd8350b323294de0c5c33675493854879259e889c432a4facc92536b0a859d65d473865cde4e5d57fbea4b0d6 WHIRLPOOL d812c86d79c3ed183c8bd45e7275397151a84867769aff093ca60eddf4ad067819101da98810025dbfd6517aa1c3103d71ebd082750f0485526e9dc7e788fdb1
|
||||
MISC ChangeLog 20451 SHA256 c6a77fe2c31e9aa50f7411fe5a2365f4536386e45ed0b22ecded842f5da49797 SHA512 873009226b97f5a597c83135ef68d607f30bf9a217156b139863c5e3e21b1d5f66a48b47f67162c35b2e14d41564b897ac1d49f7d50c64fa1e0a766820b0f4ff WHIRLPOOL e21ea5d8c8ca472427f10c892ea062d1595c7a3a43447f3acd644c18e3004a1aee999c7ffeba79b334adfc5463d1b0bba9381bf7fe580b487881523e6b8bf77e
|
||||
EBUILD ruby-gettext-3.1.5.ebuild 1677 SHA256 9847c4269d84b11422d29d3f8203f6eaf7ac3ff99643bb1418a7f6b5192b81c2 SHA512 3a41890a74f219cd4159e9abcab1efcfb0cde7fb2a4f8054911fdf640d156f6a2e554bbe819f181d3bed6ac3622d400f2ecd95990a3a5348eeb03621027afe53 WHIRLPOOL c8f4d23e7bc203ad9e5878be4bf8ae1cb3a8b0fd66102be37e072079764833f4bb4417de414b32d512390926bae3f1a4a093502cd875e6b1ce713bac49c0d23e
|
||||
MISC ChangeLog 20582 SHA256 29d03c507cff0166fc13125cf82c09a4379bc8795460de73da40b550b0979568 SHA512 f4196dd72e80ae8b6cb9f80318a1c979ed89244ae977dfb0a48d72bd1dcb7e1ef1bc49a1ad087bfefb01846809babe6c8956bee297908ed70bf9a55b87b19643 WHIRLPOOL 384a149b33bab3d85410ffb97d2263bc68541da5c613d908382c3418f1472e039b0a9e83f192a2dacdc82250e57904698921d11302ef9afdc046d37f3c4887bf
|
||||
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iF4EAREIAAYFAlS+AyAACgkQiIP6VqMIqNdK1wEAjPGcXabYzLqQt9NiHpvRTPAR
|
||||
aVJ3q3vZaD2ramaFXCEA/0c2Q2YPdOrL/WJaCogQqtzBaQi0yBN/zY4DKJMuBW0z
|
||||
=+MHX
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,63 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.5.ebuild,v 1.1 2015/01/20 07:26:17 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_NAME="${PN/ruby-/}"
|
||||
RUBY_FAKEGEM_VERSION="${PV%_*}"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_DOC="yard"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="none"
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="locale po"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
|
||||
HOMEPAGE="http://ruby-gettext.github.io/"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="doc test"
|
||||
SLOT="0"
|
||||
LICENSE="|| ( Ruby LGPL-3+ )"
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
|
||||
|
||||
ruby_add_bdepend "doc? ( dev-ruby/yard )
|
||||
dev-ruby/racc"
|
||||
ruby_add_bdepend "test? (
|
||||
dev-ruby/test-unit:2
|
||||
dev-ruby/test-unit-rr )"
|
||||
|
||||
RDEPEND+=" sys-devel/gettext"
|
||||
DEPEND+=" sys-devel/gettext"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Fix broken racc invocation
|
||||
sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
|
||||
|
||||
# Avoid bundler dependency
|
||||
sed -i -e '/bundler/,/helper.install/ s:^:#:' \
|
||||
-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
|
||||
|
||||
# Avoid dependency on developer-specific tools.
|
||||
sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
# Upstream tries to daisy-chain rake calls but they fail badly
|
||||
# with our setup, so run it manually.
|
||||
${RUBY} test/run-test.rb || die "tests failed"
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r samples
|
||||
}
|
||||
@ -1,17 +1,17 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX ogre-1.9-compat.patch 22728 SHA256 76f7d07926c654f15144f73eb8f75df66655ea512c9e3d27047cc37d189a249a SHA512 68c2582d04b3a2b936f499ac8ed5af43c7cf9987e9269d2c6450c87e43dc501f8a2dafca403196e4a735e5ff401b3501165350b0c9e0ffe45968067951773db1 WHIRLPOOL ba34bdc3630f713c1497c9971894b5848bda0e5fa0c35370d2d46e39de64d924a9eb3e2005efe569140896e80a5a9abf5e90b45cc2331856387cb3a93c71d714
|
||||
DIST freeorion-0.4.3.tar.bz2 171281552 SHA256 f0a61a42ba09ed2c8b453b734af7320582f8711913b741c5f9d86cad214bf7cf SHA512 87a73c97af14c0c81cfa19023aec410dd785988cab1edafb0e696305e6203fb431faddcc6ca2c4040e5ef0e8a228c2fda6ccf0f0ef93b47aa48ccd0758ecbe02 WHIRLPOOL 1761c2bf6d67fc93bb8e15b60c2dc23b1145e3d101fb1fde85996f94b83875a57d0c7e518e7b404a6d2098d6909feb8458b2630b6d6415c48fd6cc709165d9df
|
||||
DIST freeorion-0.4.4-ogre-1.9-compat.patch.bz2 3950 SHA256 068f2f18ccf9f8188cafa06559aea91ae6a638d2650bd39633ce94a107b3c374 SHA512 2ae9744502e81cd24ff644c0c747ff57412e22fa3580532289f5afdadd1b88b42b956082357c3b3aa785499e967dc2127df8d0eeb116718b4246f7d9954b1e10 WHIRLPOOL c0dc3f7191b7f2c2ce6f83d21a2d85abaa9e699d28a557bb4cbf51035b62f37f0b0d3dd9cb9c8f0d8e84e72724a5875d6f73cf942fd0a8432e4146845aac70d3
|
||||
DIST freeorion-0.4.4.tar.bz2 143462526 SHA256 0941242cb690ef00d9e2faec833b0a0ec2d593b97faba5af5866b738111c6203 SHA512 b2989c859af6c13a945b28b8f1344025230d71d0b0b7f0b46c4a3b2c88775b7fe3f88b7250233dab7a5887a0e6d7936da970647a7e056e97ea5f0fef08df6513 WHIRLPOOL 44b8a85b8300394a7b64991ce6d3399e089be6231f7eba1298bcd72009cc83fb49ffaaa6877ced00b275b64f1b63858c87270f6207f9b7c380c11b6a719916f6
|
||||
EBUILD freeorion-0.4.3.ebuild 3006 SHA256 4d2da53551158be6048e211f3fde77ce56053d3af5afc8f9aded92abc8ce9bea SHA512 3f0d13a0d7bddb076ba8fdaa821e7a30a56e0f6891300cb8b5aa37b1711728cdf40d454733baffe8454113c2d2cf1935c5ce382429becf6a02f140c7bb9d4175 WHIRLPOOL 5f06760038b91168c301bae2c63e24c08aa2cec569d565006cd071a365b25dd822a7fa6c7c8aa581b7d1495b4888a570c172bf18c237b4126d7f0351ef458250
|
||||
EBUILD freeorion-0.4.4.ebuild 3030 SHA256 b1723d5f791708199df07000bde431910be8ade29351409d7d9140e7257edddb SHA512 780da745fd3c1c5ee60be766aa68b3ef4fff860323c22df63bbd4eb117e0d83f5d5e80027b37e42e2ecf2ce16002c5dd9eff269428d6faba11f3f37a0ae1e6a5 WHIRLPOOL ebde842f2e88c3502540543407a8b2e747e77708dd2452bc2925c928dcfd3ba3544461f164fb13026e21947e5cfba99ae589fffc2746296d04e9ec29b5050e13
|
||||
MISC ChangeLog 2535 SHA256 739d310889bdef2201fec0130e2c52935f7412810fcbfe3f4365d82f901ad6a6 SHA512 c5858784f345a9eef713d1b2fa2a1d2263964efafd750122581964a95c13aa0abee9bcfc56c783a11666047b8a0dee2784a2aef4e47a7a34f60e64cd65f2d4c8 WHIRLPOOL 9fe6e59c9cb91370c0708330383d86b40da526d97de7bc5c3e7508a7b9438340414e9804c190db84a92c0c2032085aa8c4edbffeef558b454fe66088bfcbc6a8
|
||||
EBUILD freeorion-0.4.4.ebuild 3094 SHA256 f452bbbc267921383f607380ee753bdc3951f0c3b92aeda4f949dc333af5aba7 SHA512 dae7ad4824e4cd2fd0357d5e7c000f031762a1bc12ff1a6f52819209844886a1a6be9f0091f0e9a272cf179f07771d554ebd937c659949320159ca8b4dbd1b44 WHIRLPOOL cb461b219316ae77f24c9887c7f01168520c492432b48d5e0b0be65ad82d52042c94b76ec837e9b23faa8f53d388e734474526c06a530e27027618b38cd779e0
|
||||
MISC ChangeLog 2686 SHA256 04ff35061d0fef6a8ccf9f55b6e6c4bf5e2d01fab77e913b77bf32fc16ce7751 SHA512 5fc247c74d8f93cba666f0741064f01fee3493124896288af6263bb87b779621e3b822a723cef8bdc54801bb36339cd7065d037e0034495e97fcf3bbd2de773b WHIRLPOOL 5b23ed38d9fa6af4e55ed592a803df3460db04f05049da45d397e3d877209e53b55edb271a6f1af208df62c232b1e0b79602d8dbc2c261bbce0e44c639120988
|
||||
MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iF4EAREIAAYFAlSzxzAACgkQid6yGVZcMrxSMgD+Oa63ESIOcHEBOw9V0mnAUylQ
|
||||
2pasoVBaKIo3ZDM50JMA/0HO5Ba8jF0YdFv070YQ6ymF1rgSINdW6rXmcZa5wgcN
|
||||
=NEUv
|
||||
iF4EAREIAAYFAlS+H8YACgkQid6yGVZcMrzRAQEAxNkyZXD/31ND/WxZrtYE04Km
|
||||
g8xj+pAdyt4dNR74tt0BAOBXi6V74DEl+Q8MGGJJG41z3Ck5ipNsd6RKhY5V1FQ9
|
||||
=sYwJ
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,415 +0,0 @@
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/include/BatchedGeometry.h freeorion-0.4.4/PagedGeometry/include/BatchedGeometry.h
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/include/BatchedGeometry.h 2015-01-12 13:16:19.480177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/include/BatchedGeometry.h 2015-01-12 13:44:40.700200986 +0100
|
||||
@@ -88,7 +88,11 @@
|
||||
void setMaterialName(const Ogre::String &mat, const Ogre::String &rg =
|
||||
Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME)
|
||||
{
|
||||
- m_ptrMaterial = Ogre::MaterialManager::getSingleton().getByName(mat, rg);
|
||||
+#if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ m_ptrMaterial = Ogre::MaterialManager::getSingleton().getByName(mat, rg);
|
||||
+#else
|
||||
+ m_ptrMaterial = Ogre::MaterialManager::getSingleton().getByName(mat, rg).staticCast<Ogre::Material>();
|
||||
+#endif
|
||||
}
|
||||
|
||||
/// Get material name. Be careful, resource group name missing
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/BatchedGeometry.cpp freeorion-0.4.4/PagedGeometry/source/BatchedGeometry.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/BatchedGeometry.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/BatchedGeometry.cpp 2015-01-12 13:29:10.890188192 +0100
|
||||
@@ -479,7 +479,11 @@
|
||||
// that the user may be using somewhere else).
|
||||
{
|
||||
Ogre::String newName = parentMaterial->getName() + "_Batched";
|
||||
- m_ptrMaterial = MaterialManager::getSingleton().getByName(newName, parentMaterial->getGroup());
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ m_ptrMaterial = MaterialManager::getSingleton().getByName(newName, parentMaterial->getGroup());
|
||||
+ #else
|
||||
+ m_ptrMaterial = MaterialManager::getSingleton().getByName(newName, parentMaterial->getGroup()).staticCast<Material>();
|
||||
+ #endif
|
||||
if (m_ptrMaterial.isNull())
|
||||
m_ptrMaterial = parentMaterial->clone(newName);
|
||||
}
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/BatchPage.cpp freeorion-0.4.4/PagedGeometry/source/BatchPage.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/BatchPage.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/BatchPage.cpp 2015-01-12 13:27:56.810187173 +0100
|
||||
@@ -472,7 +472,11 @@
|
||||
}
|
||||
|
||||
//Search for the desired material
|
||||
- MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str());
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str());
|
||||
+ #else
|
||||
+ MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str()).staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
if (generatedMaterial.isNull())
|
||||
{
|
||||
//Clone the material
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/GrassLoader.cpp freeorion-0.4.4/PagedGeometry/source/GrassLoader.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/GrassLoader.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/GrassLoader.cpp 2015-01-12 13:31:39.330190235 +0100
|
||||
@@ -765,7 +765,11 @@
|
||||
void GrassLayer::setMaterialName(const String &matName)
|
||||
{
|
||||
if (material.isNull() || matName != material->getName()){
|
||||
- material = MaterialManager::getSingleton().getByName(matName);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ material = MaterialManager::getSingleton().getByName(matName);
|
||||
+ #else
|
||||
+ material = MaterialManager::getSingleton().getByName(matName).staticCast<Material>();
|
||||
+ #endif
|
||||
if (material.isNull())
|
||||
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "The specified grass material does not exist", "GrassLayer::setMaterialName()");
|
||||
shaderNeedsUpdate = true;
|
||||
@@ -1128,7 +1132,11 @@
|
||||
const String matName = material->getName() + "_" + vsName;
|
||||
|
||||
//Check if the desired material already exists (if not, create it)
|
||||
- MaterialPtr tmpMat = MaterialManager::getSingleton().getByName(matName);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ MaterialPtr tmpMat = MaterialManager::getSingleton().getByName(matName);
|
||||
+ #else
|
||||
+ MaterialPtr tmpMat = MaterialManager::getSingleton().getByName(matName).staticCast<Material>();
|
||||
+ #endif
|
||||
if (tmpMat.isNull())
|
||||
{
|
||||
//Clone the original material
|
||||
@@ -1140,7 +1148,11 @@
|
||||
|
||||
//Check if the desired shader already exists (if not, compile it)
|
||||
String shaderLanguage;
|
||||
- HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName(vsName);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName(vsName);
|
||||
+ #else
|
||||
+ HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName(vsName).staticCast<HighLevelGpuProgram>();
|
||||
+ #endif
|
||||
if (vertexShader.isNull())
|
||||
{
|
||||
if (Root::getSingleton().getRenderSystem()->getName() == "Direct3D9 Rendering Subsystem")
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/ImpostorPage.cpp freeorion-0.4.4/PagedGeometry/source/ImpostorPage.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/ImpostorPage.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/ImpostorPage.cpp 2015-01-12 13:32:29.390190924 +0100
|
||||
@@ -402,7 +402,11 @@
|
||||
//Set up materials
|
||||
for (int o = 0; o < IMPOSTOR_YAW_ANGLES; ++o){
|
||||
for (int i = 0; i < IMPOSTOR_PITCH_ANGLES; ++i){
|
||||
- material[i][o] = MaterialManager::getSingleton().create(getUniqueID("ImpostorMaterial"), "Impostors");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ material[i][o] = MaterialManager::getSingleton().create(getUniqueID("ImpostorMaterial"), "Impostors");
|
||||
+ #else
|
||||
+ material[i][o] = MaterialManager::getSingleton().create(getUniqueID("ImpostorMaterial"), "Impostors").staticCast<Material>();
|
||||
+ #endif
|
||||
|
||||
Material *m = material[i][o].getPointer();
|
||||
Pass *p = m->getTechnique(0)->getPass(0);
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/StaticBillboardSet.cpp freeorion-0.4.4/PagedGeometry/source/StaticBillboardSet.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/StaticBillboardSet.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/StaticBillboardSet.cpp 2015-01-12 13:34:51.270192876 +0100
|
||||
@@ -149,7 +149,11 @@
|
||||
"}";
|
||||
}
|
||||
|
||||
- HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName("Sprite_vp");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName("Sprite_vp");
|
||||
+ #else
|
||||
+ HighLevelGpuProgramPtr vertexShader = HighLevelGpuProgramManager::getSingleton().getByName("Sprite_vp").staticCast<HighLevelGpuProgram>();
|
||||
+ #endif
|
||||
assert(vertexShader.isNull() && "Sprite_vp already exist");
|
||||
|
||||
vertexShader = HighLevelGpuProgramManager::getSingleton().createProgram(
|
||||
@@ -257,7 +261,11 @@
|
||||
"}";
|
||||
}
|
||||
|
||||
- HighLevelGpuProgramPtr vertexShader2 = HighLevelGpuProgramManager::getSingleton().getByName("SpriteFade_vp");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ HighLevelGpuProgramPtr vertexShader2 = HighLevelGpuProgramManager::getSingleton().getByName("Sprite_vp");
|
||||
+ #else
|
||||
+ HighLevelGpuProgramPtr vertexShader2 = HighLevelGpuProgramManager::getSingleton().getByName("Sprite_vp").staticCast<HighLevelGpuProgram>();
|
||||
+ #endif
|
||||
assert(vertexShader2.isNull() && "SpriteFade_vp already exist");
|
||||
vertexShader2 = HighLevelGpuProgramManager::getSingleton().createProgram("SpriteFade_vp",
|
||||
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, shaderLanguage, GPT_VERTEX_PROGRAM);
|
||||
@@ -574,7 +582,11 @@
|
||||
else if (!mPtrMaterial.isNull())
|
||||
SBMaterialRef::removeMaterialRef(mPtrMaterial);
|
||||
|
||||
- mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup);
|
||||
+ #else
|
||||
+ mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup).staticCast<Material>();
|
||||
+ #endif
|
||||
|
||||
if (mFadeEnabled)
|
||||
{
|
||||
@@ -590,7 +602,11 @@
|
||||
}
|
||||
else // old GPU compatibility
|
||||
{
|
||||
- mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup);
|
||||
+ #else
|
||||
+ mPtrMaterial = MaterialManager::getSingleton().getByName(materialName, resourceGroup).staticCast<Material>();
|
||||
+ #endif
|
||||
mpFallbackBillboardSet->setMaterialName(mPtrMaterial->getName(), mPtrMaterial->getGroup());
|
||||
// SVA. Since Ogre 1.7.3 Ogre::BillboardSet have setMaterial(const MaterialPtr&) method
|
||||
}
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/PagedGeometry/source/WindBatchPage.cpp freeorion-0.4.4/PagedGeometry/source/WindBatchPage.cpp
|
||||
--- freeorion-0.4.4-orig/PagedGeometry/source/WindBatchPage.cpp 2015-01-12 13:16:19.470177578 +0100
|
||||
+++ freeorion-0.4.4/PagedGeometry/source/WindBatchPage.cpp 2015-01-12 13:35:22.100193300 +0100
|
||||
@@ -467,7 +467,11 @@
|
||||
}
|
||||
|
||||
//Search for the desired material
|
||||
- MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str());
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str());
|
||||
+ #else
|
||||
+ MaterialPtr generatedMaterial = MaterialManager::getSingleton().getByName(materialSignature.str()).staticCast<Material>();
|
||||
+ #endif
|
||||
if (generatedMaterial.isNull())
|
||||
{
|
||||
//Clone the material
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/UI/CombatSetupWnd.cpp freeorion-0.4.4/UI/CombatSetupWnd.cpp
|
||||
--- freeorion-0.4.4-orig/UI/CombatSetupWnd.cpp 2015-01-12 13:16:18.650177567 +0100
|
||||
+++ freeorion-0.4.4/UI/CombatSetupWnd.cpp 2015-01-12 13:17:12.200178304 +0100
|
||||
@@ -126,7 +126,11 @@
|
||||
// HACK! This currently assumes all rings are starlane exclusion
|
||||
// zones, so we only create one mesh for all RING's and reuse it;
|
||||
// this may need to be generalized later.
|
||||
- Ogre::MeshPtr ring_mesh = Ogre::MeshManager::getSingleton().getByName(RING_MESH_NAME);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MeshPtr ring_mesh = Ogre::MeshManager::getSingleton().getByName(RING_MESH_NAME);
|
||||
+ #else
|
||||
+ Ogre::MeshPtr ring_mesh = Ogre::MeshManager::getSingleton().getByName(RING_MESH_NAME).staticCast<Ogre::Mesh>();
|
||||
+ #endif
|
||||
if (ring_mesh.isNull()) {
|
||||
Ogre::ManualObject manual_object("");
|
||||
manual_object.estimateVertexCount(unit_circle_vertices.size() * 2 + 2);
|
||||
@@ -152,7 +156,11 @@
|
||||
}
|
||||
|
||||
case CombatSetupRegion::ELLIPSE: {
|
||||
- Ogre::MeshPtr unit_circle_mesh = Ogre::MeshManager::getSingleton().getByName(UNIT_CIRCLE_MESH_NAME);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MeshPtr unit_circle_mesh = Ogre::MeshManager::getSingleton().getByName(UNIT_CIRCLE_MESH_NAME);
|
||||
+ #else
|
||||
+ Ogre::MeshPtr unit_circle_mesh = Ogre::MeshManager::getSingleton().getByName(UNIT_CIRCLE_MESH_NAME).staticCast<Ogre::Mesh>();
|
||||
+ #endif
|
||||
if (unit_circle_mesh.isNull()) {
|
||||
Ogre::ManualObject manual_object("");
|
||||
manual_object.estimateVertexCount(unit_circle_vertices.size() + 2);
|
||||
@@ -478,8 +486,13 @@
|
||||
std::string base_material_name = ShipMaterialName(*ship->Design(), ship->Owner());
|
||||
std::string material_name = UNPLACEABLE_MATERIAL_PREFIX + base_material_name;
|
||||
if (!Ogre::MaterialManager::getSingleton().resourceExists(material_name)) {
|
||||
- Ogre::MaterialPtr unmodified_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName(base_material_name);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr unmodified_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(base_material_name);
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr unmodified_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(base_material_name).staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
Ogre::MaterialPtr material = unmodified_material->clone(material_name);
|
||||
Ogre::Pass* pass = material->getTechnique(0)->getPass(1);
|
||||
assert(pass->hasFragmentProgram());
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/UI/CombatWnd.cpp freeorion-0.4.4/UI/CombatWnd.cpp
|
||||
--- freeorion-0.4.4-orig/UI/CombatWnd.cpp 2015-01-12 13:16:18.650177567 +0100
|
||||
+++ freeorion-0.4.4/UI/CombatWnd.cpp 2015-01-12 13:43:29.950200012 +0100
|
||||
@@ -329,8 +329,13 @@
|
||||
Ogre::Entity* entity =
|
||||
scene_manager->createEntity("asteroid mesh " + base_name,
|
||||
base_name + ".mesh");
|
||||
- Ogre::MaterialPtr material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("asteroid");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("asteroid");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("asteroid").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
std::string new_material_name = "asteroid material " + base_name;
|
||||
material = material->clone(new_material_name);
|
||||
material->getTechnique(0)->getPass(0)->getTextureUnitState(0)->
|
||||
@@ -905,16 +910,26 @@
|
||||
|
||||
// pick and assign star textures
|
||||
{
|
||||
- Ogre::MaterialPtr back_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr back_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr back_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
Ogre::Technique* technique = back_material->getTechnique(0);
|
||||
technique->getPass(0)->getTextureUnitState(0)->setTextureName(base_name + "back.png");
|
||||
technique->getPass(1)->getTextureUnitState(0)->setTextureName(base_name + "rainbow.png");
|
||||
technique->getPass(2)->getTextureUnitState(0)->setTextureName(base_name + "rays.png");
|
||||
technique->getPass(3)->getTextureUnitState(0)->setTextureName(base_name + "horizontal_flare.png");
|
||||
technique->getPass(4)->getTextureUnitState(0)->setTextureName(base_name + "horizontal_flare.png");
|
||||
- Ogre::MaterialPtr core_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr core_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr core_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
technique = core_material->getTechnique(0);
|
||||
technique->getPass(0)->getTextureUnitState(0)->setTextureName(base_name + "core.png");
|
||||
|
||||
@@ -1005,8 +1020,13 @@
|
||||
entity->setQueryFlags(UNSELECTABLE_OBJECT_MASK);
|
||||
std::string new_material_name =
|
||||
material_name + "_" + boost::lexical_cast<std::string>(orbit);
|
||||
- Ogre::MaterialPtr material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName(material_name);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(material_name);
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(material_name).staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
material = material->clone(new_material_name);
|
||||
m_planet_assets[orbit].second.push_back(material);
|
||||
material->getTechnique(0)->getPass(0)->getTextureUnitState(0)->
|
||||
@@ -1019,11 +1039,19 @@
|
||||
entity->setVisibilityFlags(REGULAR_OBJECTS_MASK);
|
||||
std::string new_material_name =
|
||||
material_name + "_" + boost::lexical_cast<std::string>(orbit);
|
||||
- Ogre::MaterialPtr material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName(
|
||||
- material_name == "planet" ?
|
||||
- PlanetMaterialName(base_name) :
|
||||
- material_name);
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(
|
||||
+ material_name == "planet" ?
|
||||
+ PlanetMaterialName(base_name) :
|
||||
+ material_name);
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(
|
||||
+ material_name == "planet" ?
|
||||
+ PlanetMaterialName(base_name) :
|
||||
+ material_name).staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
material = material->clone(new_material_name);
|
||||
m_planet_assets[orbit].second.push_back(material);
|
||||
assert(entity->getNumSubEntities() == 1u);
|
||||
@@ -1046,9 +1074,15 @@
|
||||
entity->setRenderQueueGroup(ALPHA_OBJECTS_QUEUE);
|
||||
entity->setVisibilityFlags(REGULAR_OBJECTS_MASK);
|
||||
entity->setQueryFlags(UNSELECTABLE_OBJECT_MASK);
|
||||
- Ogre::MaterialPtr material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName(
|
||||
- AtmosphereMaterialName(base_name));
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(
|
||||
+ AtmosphereMaterialName(base_name));
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName(
|
||||
+ AtmosphereMaterialName(base_name)).staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
entity->setMaterialName(material->getName());
|
||||
m_planet_assets[orbit].second.push_back(material);
|
||||
node->attachObject(entity);
|
||||
@@ -1568,7 +1602,11 @@
|
||||
|
||||
const bool ENABLE_GLOW = GetOptionsDB().Get<bool>("combat.enable-glow");
|
||||
Ogre::CompositorManager::getSingleton().setCompositorEnabled(m_viewport, "effects/glow", ENABLE_GLOW);
|
||||
- Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
material->getTechnique(0)->getPass(3)->setDepthCheckEnabled(!ENABLE_GLOW);
|
||||
material->getTechnique(0)->getPass(4)->setDepthCheckEnabled(!ENABLE_GLOW);
|
||||
|
||||
@@ -1618,8 +1656,13 @@
|
||||
|
||||
const int SAMPLES_PER_SIDE = 2;
|
||||
const int TOTAL_SAMPLES = 5;
|
||||
- Ogre::MaterialPtr core_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr core_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr core_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_core").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
const Ogre::Real STAR_CORE_SCALE_FACTOR =
|
||||
core_material->getTechnique(0)->getPass(0)->getTextureUnitState(0)->getTextureUScale();
|
||||
const Ogre::Real SAMPLE_INCREMENT =
|
||||
@@ -1743,8 +1786,13 @@
|
||||
m_star_back_billboard->setColour(
|
||||
Ogre::ColourValue(1.0, 1.0, 1.0, m_star_brightness_factor));
|
||||
|
||||
- Ogre::MaterialPtr back_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr back_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr back_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("backgrounds/star_back").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
back_material->getTechnique(0)->getPass(3)->getTextureUnitState(0)->setTextureUScroll(
|
||||
m_initial_left_horizontal_flare_scroll + m_left_horizontal_flare_scroll_offset);
|
||||
back_material->getTechnique(0)->getPass(4)->getTextureUnitState(0)->setTextureUScroll(
|
||||
@@ -1834,8 +1882,13 @@
|
||||
assert(ship->Design());
|
||||
const ShipDesign& ship_design = *ship->Design();
|
||||
|
||||
- Ogre::MaterialPtr ship_material =
|
||||
- Ogre::MaterialManager::getSingleton().getByName("ship");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ Ogre::MaterialPtr ship_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("ship");
|
||||
+ #else
|
||||
+ Ogre::MaterialPtr ship_material =
|
||||
+ Ogre::MaterialManager::getSingleton().getByName("ship").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
std::string modified_material_name = ShipMaterialName(ship_design, ship->Owner());
|
||||
Ogre::MaterialPtr& modified_material = m_ship_materials[modified_material_name];
|
||||
if (!modified_material.get()) {
|
||||
diff -U 3 -dHrN freeorion-0.4.4-orig/UI/EntityRenderer.cpp freeorion-0.4.4/UI/EntityRenderer.cpp
|
||||
--- freeorion-0.4.4-orig/UI/EntityRenderer.cpp 2015-01-12 13:16:18.670177567 +0100
|
||||
+++ freeorion-0.4.4/UI/EntityRenderer.cpp 2015-01-12 13:17:12.200178304 +0100
|
||||
@@ -123,9 +123,15 @@
|
||||
renderTextures();
|
||||
|
||||
//Set up material
|
||||
- material =
|
||||
- Ogre::MaterialManager::getSingleton().create(
|
||||
- getUniqueID("RenderedEntityMaterial"), "EntityRenderer");
|
||||
+ #if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
|
||||
+ material =
|
||||
+ Ogre::MaterialManager::getSingleton().create(
|
||||
+ getUniqueID("RenderedEntityMaterial"), "EntityRenderer");
|
||||
+ #else
|
||||
+ material =
|
||||
+ Ogre::MaterialManager::getSingleton().create(
|
||||
+ getUniqueID("RenderedEntityMaterial"), "EntityRenderer").staticCast<Ogre::Material>();
|
||||
+ #endif
|
||||
|
||||
Ogre::Material* m = material.getPointer();
|
||||
Ogre::Pass* p = m->getTechnique(0)->getPass(0);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue