root
12 years ago
parent
e502bc4deb
commit
67f69fcf22
@ -1 +1,2 @@
|
||||
DIST salt-0.9.8.tar.gz 1641495 SHA256 a00cb012b8caca3ce30ecf37a8bc9e0ba3048d5158ff6914918a913aae07ed15 SHA512 767f87d15483f101d5f264371abaf5ddb048a997ed758078a2ad015bd1bfb62224e7d9e6e5556af069766d20f3decc8944ab947e07f1ada6192b0c5dc50796e5 WHIRLPOOL c99f6ba40319cead3a4cb801ea6c9d3a1398642bcfcad1e018d128dc9dc216cf5ab7c55c140d22f6c08623bd61b3b0f026480fb224ffe82199d863e41defd0c7
|
||||
DIST salt-0.10.0.tar.gz 1966467 RMD160 33731fcceab5e8f8cf5dc91bcf3caaa50f3037f8 SHA1 4f27d2fe80230082cdc770dd6e6cf172fa7f93b3 SHA256 268545290cf736bb1d0ba9c6fa73927c77c9cec2a7ed73112c970fd00b2aa94a
|
||||
DIST salt-0.9.8.tar.gz 1641495 RMD160 236fb3d5e514127067ae381aad9061afd6bbb741 SHA1 0b25385f23ccb24b41bf26f0767c55eaf871aaca SHA256 a00cb012b8caca3ce30ecf37a8bc9e0ba3048d5158ff6914918a913aae07ed15 SHA512 767f87d15483f101d5f264371abaf5ddb048a997ed758078a2ad015bd1bfb62224e7d9e6e5556af069766d20f3decc8944ab947e07f1ada6192b0c5dc50796e5 WHIRLPOOL c99f6ba40319cead3a4cb801ea6c9d3a1398642bcfcad1e018d128dc9dc216cf5ab7c55c140d22f6c08623bd61b3b0f026480fb224ffe82199d863e41defd0c7
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.1 2012/07/06 23:16:24 chutzpah Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
|
||||
|
||||
inherit eutils python-distutils-ng
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager."
|
||||
HOMEPAGE="http://saltstack.org/"
|
||||
SRC_URI="mirror://github/saltstack/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE="+jinja libvirt mongodb mysql redis"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
>=dev-python/pyzmq-2.1.9
|
||||
dev-python/msgpack
|
||||
dev-python/pyyaml
|
||||
dev-python/m2crypto
|
||||
dev-python/pycrypto
|
||||
dev-python/pycryptopp
|
||||
jinja? ( dev-python/jinja )
|
||||
libvirt? ( app-emulation/libvirt[python] )
|
||||
mongodb? ( dev-python/pymongo )
|
||||
mysql? ( dev-python/mysql-python )
|
||||
redis? ( dev-python/redis-py )"
|
||||
|
||||
src_prepare() {
|
||||
sed -i '/install_requires=/ d' setup.py || die "sed failed"
|
||||
|
||||
python-distutils-ng_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
python-distutils-ng_src_install
|
||||
|
||||
for s in minion master syndic; do
|
||||
newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
|
||||
newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
|
||||
done
|
||||
|
||||
# install the config template files
|
||||
dodir /etc/${PN}
|
||||
for conf in conf/*.template; do
|
||||
sed '1 d' ${conf} > "${D}"/etc/${PN}/"$(basename "${conf%.template}")" \
|
||||
|| die "sed failed"
|
||||
done
|
||||
|
||||
dodoc README.rst AUTHORS
|
||||
}
|
||||
|
||||
python_test() {
|
||||
./setup.py test || die
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST gzip-1.4.tar.gz 907411 SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee SHA512 9ba6d11f0469b80433a5da25f834f7652db109c235e2a849f4249adae3929fda9ebef98a181cc928a5dfc2b0d35df8b220afba130cd4a596a4dbddbf3fe8d2bc WHIRLPOOL 3d8552d2dc660953714f49674e8af2319eade0fd33c705ee253c2ea215cf4e5c3e6b7088c7087060ea7751508c74769b5b64d9e88bc22ea1d7ad0e8680a616e5
|
||||
DIST gzip-1.5.tar.xz 720956 SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173 SHA512 27b1b9c1ab75331b5368abb54541f3f251009a3bc6e49e42cda13bc088673d9f8c89c55caa63da60c1ea70fac2e6de24203b7aeaaaad4bc54302edbe275f46ea WHIRLPOOL c718e5e4e0e6f29de285380c25564997615b7213fa32604922436c3c6221bb9531d01518a6cc4e0a80b4694bb040768654d4bf07bb48290f90e61f13962e96ab
|
||||
DIST gzip-1.4.tar.gz 907411 RMD160 a74f782960387e3f05373acc258becb564eda82d SHA1 1d398dac6a7920a7de6e2685fe472a840eb2ce6e SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
|
||||
DIST gzip-1.5.tar.xz 720956 RMD160 bffba2488ac06b314072cb51f131e021970667c7 SHA1 473aaac6a48445221fd5b03fde52f0236c7486ab SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From 2f853bab67b087605a10f544a7df780ac98b8583 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
|
||||
Date: Sat, 7 Jul 2012 17:28:59 +0200
|
||||
Subject: [PATCH] Fix missing linkage with gmodule-2.0.
|
||||
|
||||
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
|
||||
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
|
||||
---
|
||||
dia-0.97.2/configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
|
||||
index 72830de..6b7394a 100644
|
||||
--- a/dia-0.97.2/configure.in
|
||||
+++ b/dia-0.97.2/configure.in
|
||||
@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
|
||||
AC_SUBST(GMODULE_LIBS)
|
||||
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
|
||||
|
||||
-GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
|
||||
+GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
|
||||
PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, ,
|
||||
AC_MSG_ERROR([Need Pango version 1.8.0 or higher]))
|
||||
|
||||
--
|
||||
1.7.11.1
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST calibre-0.8.52.tar.xz 24690364 SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a SHA512 9fb6bb085b8f42a0ad3f63141ce2de63cc7e7c0d5ed914904ddd05fac3713c4c47f093e4579ceab7080627585167e7312039cbc8bc2a1e969937553e123d072a WHIRLPOOL 569be4afc50c78bb4bb35f5d61201760c8ea5fa25d6bcafb343dd6cdfc4a5fc2ff4175549438a9473302331c982f4cfc1d0a916ff2ac3593072f4154142966e2
|
||||
DIST calibre-0.8.57.tar.xz 24957924 SHA256 e724a3228eaf0089e2c59ec814ffdaf9734052cb4fb310df4cdfd0dc57a2c9f7 SHA512 e8a989369f51200e0e5d6e141f83ec0a0705451c9c76b8cf6067e381f48039c36a62ae85356fc8287f481ef055d8e6a91a229cc6aeee46a404fc2dd89c403ef0 WHIRLPOOL 0041cd44c37cf5e2aef7823f7768eda7ea4237a263fdeb2702be450e8ee5fad1126ef3e2bec86bffefafa4796de7303d77793c39823b0bf1f3d0a79c20ff163d
|
||||
DIST calibre-0.8.58.tar.xz 24990000 SHA256 f0b9ca637793c9817e2051d4bd6eacd5388a030b11c1470ca5b5b929d4115149 SHA512 6e9b6ef2ddfda17b4ba8627055ae625022fa0ca6d907f050b186364b092189029654c146526875476c9e55063ccb9b66d89c590771cd45b4b844014d01c55765 WHIRLPOOL 37e3c8a975d110222192cdb8b6f7ea576537362dc2875549928ddd99dc99773aa50a413dfa4e9954998b9d3170c2e9680af8a9a229f4c9b96b594d2de8ae5335
|
||||
DIST calibre-0.8.59.tar.xz 25001852 SHA256 cdab81f39cf558bf09b16eb3327b33e7edb958395f9180172e08f9879deeb7af SHA512 8f59b9eb68bde65efa2ec7f9045e7ca12a21db603dda4ddc7f5dc01ab7ec0e213d2137bcc9c899e31c895edb793603fa920a00747ad20a811cf0bfd43438045e WHIRLPOOL 2ed37c682752b281286f37a310019cad354030189b9f35349c2f7d4d35cf32235e5ebd4fcf70663705c845ea906844ea205b5de88244453c7ec3a18a92a9355a
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.57.ebuild,v 1.1 2012/06/22 10:24:39 zmedico Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.59.ebuild,v 1.1 2012/07/06 23:31:34 zmedico Exp $
|
||||
|
||||
EAPI=4
|
||||
PYTHON_DEPEND=2:2.7
|
||||
@ -1 +1 @@
|
||||
DIST qpdfview-0.3.tar.gz 101769 SHA256 cba7efd473c2ed88747add888813f472d28a7775ce934c3f2d7cc136418c987c SHA512 f205ea6385ae0413e3f600d1af7db1589c9f41b2087e194e73796922bcd72e189617949c79d9f787a811c879e566253da3d2d1b6924cb477957bfd92ad78b356 WHIRLPOOL d4ef39ab4b5c33275e31368b8eec74b6c2d78e0b10c9ec877a424b4ff8829c9436845e6fb711c60a825e11568e9394bd157bf46e5c7aab65fffc18a76c83de5f
|
||||
DIST qpdfview-0.3.1.tar.gz 76652 SHA256 1eb1c6c2eb80f4a37f137983fce83bb640aa47bbc3b8a69e3ddd8d917f016b57 SHA512 0b632390b79eb838fcfaba5828c83c1d88ad82ae0dbea521ea81774ea77b03a24018c095516b59d8cfa66b6729980505e3c5325fbebd3307cbf054852f8ab9b6 WHIRLPOOL 357aaa9fafeb1795a4653ab9fbbf05f0cb8c104960f3cbce9d15cbc431586f1536a7a45f0de7db364da4e6b3b30b1ac08f6ba6e2184f827118d501bc1d5f4196
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST qdbm-1.8.77.tar.gz 948271 SHA256 e413a57b28061f65c6e26fbec584f0d1c9c06f3142ee513fec4061f65533c772 SHA512 2a2d82e1998e5ece9ff9033e84363bebe6bb6ce5e7fa0775fe63297de88583b43afbbb4f8aa5f003ef9921472aa2ab29b905c6483aa3181777f4dadc59ffd8e4 WHIRLPOOL 44a98e1aaf04fe07eff6c60f91c493492d7e325beadb31459fc406cfbf6e899c42b93816c903b8a3add0fc304695b6d476da9c0dbffc2b6df3bed2fc3df3804e
|
||||
DIST qdbm-1.8.78.tar.gz 1015429 SHA256 b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037 WHIRLPOOL a42d2c981bf28e5b4619bf166177449abba02ef774a783c33feb7be04ef558cbec4b7e2ea4db85782eb59f57bdebeb0eb8170455e480cc5b578f7a6e0e3a39da
|
||||
|
||||
@ -1,98 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.12 2011/11/03 08:25:33 hattya Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils java-pkg-opt-2 multilib
|
||||
|
||||
DESCRIPTION="Quick Database Manager"
|
||||
HOMEPAGE="http://fallabs.com/qdbm/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="debug java perl ruby zlib"
|
||||
|
||||
RDEPEND="java? ( >=virtual/jre-1.4 )
|
||||
perl? ( dev-lang/perl )
|
||||
ruby? ( dev-lang/ruby:1.8 )
|
||||
zlib? ( sys-libs/zlib )"
|
||||
DEPEND="${RDEPEND}
|
||||
java? ( >=virtual/jdk-1.4 )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-runpath.diff
|
||||
epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
|
||||
# apply flags
|
||||
sed -i "/^CFLAGS/s|$| ${CFLAGS}|" Makefile.in
|
||||
sed -i "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" java/Makefile.in
|
||||
# replace make -> $(MAKE)
|
||||
sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
|
||||
Makefile.in \
|
||||
{cgi,java,perl,plus,ruby}/Makefile.in
|
||||
}
|
||||
|
||||
qdbm_api_for() {
|
||||
local u
|
||||
for u in java perl ruby; do
|
||||
if ! use "${u}"; then
|
||||
continue
|
||||
fi
|
||||
cd "${u}"
|
||||
case "${EBUILD_PHASE}" in
|
||||
configure)
|
||||
econf
|
||||
;;
|
||||
compile)
|
||||
emake
|
||||
;;
|
||||
test)
|
||||
emake -j1 check
|
||||
;;
|
||||
install)
|
||||
emake DESTDIR="${D}" MYDATADIR=/usr/share/doc/${P}/html install
|
||||
esac
|
||||
cd -
|
||||
done
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable debug) \
|
||||
$(use_enable zlib) \
|
||||
--enable-pthread \
|
||||
--enable-iconv
|
||||
qdbm_api_for # configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
qdbm_api_for # compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check
|
||||
qdbm_api_for # test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc ChangeLog NEWS README THANKS
|
||||
dohtml *.html
|
||||
rm -rf "${ED}"/usr/share/${PN}
|
||||
|
||||
qdbm_api_for # install
|
||||
|
||||
if use java; then
|
||||
java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
|
||||
rm -f "${ED}"/usr/$(get_libdir)/*.jar
|
||||
fi
|
||||
if use perl; then
|
||||
rm -f "${ED}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
|
||||
find "${ED}" -name .packlist -print0 | xargs -0 rm -f
|
||||
fi
|
||||
|
||||
rm -f "${ED}"/usr/bin/*test
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST textsearch_ja-8.4.2.tar.gz 39617 SHA256 9bb8d2df3d61ed8f5b9c40b09540baece7f833f0e9b7cceef7ed1bf5b32c51ef SHA512 0c5ec65c07bf9f80450c3f6c473943ee713f2a8e3b6d699e4ed82de28db18ae491b739731641463b2779b111c83250d1f5ccdba478e7646cf8734ffa4f3aca52 WHIRLPOOL 1529d853c3ebd3c7b022bf46cfd20546d701a5e4645e2f8d3989c84adc70c17b0b5ca79aa339b58102d834956eabeb9c8695e652f59f20657b61be46a9303cd2
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>cjk</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/textsearch_ja/textsearch_ja-8.4.2.ebuild,v 1.1 2012/07/06 22:45:57 naota Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Integrated Full-Text-Search for Japanese language using morphological analyze."
|
||||
HOMEPAGE="http://textsearch-ja.projects.postgresql.org/index.html"
|
||||
SRC_URI="http://pgfoundry.org/frs/download.php/2287/textsearch_ja-${PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-text/mecab
|
||||
>=dev-db/postgresql-server-7.4" # pgmecab requires PGXS
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
emake USE_PGXS=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" USE_PGXS=1 install
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
java_files := $(foreach dir,$(dirs),$(find_files))
|
||||
class_files := $(patsubst $(jdir)/%.java,%.class,$(java_files))
|
||||
|
||||
-JCFLAGS := -source 1.6 -encoding ISO-8859-1 -Xlint:unchecked -deprecation
|
||||
+JCFLAGS := $(JAVACFLAGS) -encoding ISO-8859-1 -Xlint:unchecked -deprecation
|
||||
|
||||
# standard java compilation..
|
||||
JAVACOMPILE := $(JAVAC) $(JCFLAGS) -sourcepath $(jdir) -d $(top_builddir)
|
||||
@ -1 +1,2 @@
|
||||
DIST ispc-git-1.2.2.tgz 18219664 SHA256 bae7fe36fd29cca70cb5dc21f3ba2e7760e4aeaa11d4490fedca5a7133ef50fd SHA512 c844211eedd0faa649d1c652f2f26d2030f5792334b6f1fd5e718285b233c068728423b17aad1913d51984aba9541085d8d6de4621427f5b6685332a71025d74 WHIRLPOOL 0285af72f47f4d9d27518165bce47f75c075b3454495c94a1a0e53156db8df8e6eeb0522606554c96648caeebcb16cc5f3a7c8c8785f9168234e8f3febe989cb
|
||||
DIST ispc-git-1.3.0.tgz 18280909 SHA256 6a3595450f3d9e9d790930d76d331435ca13e1aa28bc25d765703086b4a961ad SHA512 ec0c513908cb79c236e2024c64f1da81610286314fefcdcd9a5017cb9c05063154a887337f6a79111d52909ba1f2fbd815fa955a01a0ce309cd9584a50b335f7 WHIRLPOOL cd110b607191414207a55f9a27dba22cf5ab2275311210ede068fb884da685a0b7d7289bfd646cbd7708f199261e7ec38c693d86d54aa62b8a8c9d5fa6f942b5
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ispc/ispc-1.3.0.ebuild,v 1.1 2012/07/07 00:48:30 ottxor Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Intel SPMD Program Compiler"
|
||||
HOMEPAGE="http://ispc.github.com/"
|
||||
|
||||
if [[ ${PV} = *9999 ]]; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="git://github.com/ispc/ispc.git"
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="https://github.com/ispc/ispc/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
|
||||
GITHUB_ID="c6ec130"
|
||||
S="${WORKDIR}/${PN}-${PN}-${GITHUB_ID}"
|
||||
fi
|
||||
|
||||
LICENSE="BSD BSD-2 UoI-NCSA"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="examples"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-devel/clang-3.0
|
||||
>=sys-devel/llvm-3.0
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
DOCS=( README.rst )
|
||||
|
||||
src_compile() {
|
||||
emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ispc
|
||||
|
||||
if use examples; then
|
||||
insinto "/usr/share/doc/${PF}/examples"
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
doins -r examples/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,193 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p370.ebuild,v 1.1 2012/07/07 07:20:48 graaff Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib versionator
|
||||
|
||||
MY_P="${PN}-$(replace_version_separator 3 '-')"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
SLOT=$(get_version_component_range 1-2)
|
||||
MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
|
||||
# 1.8 and 1.9 series disagree on this
|
||||
RUBYVERSION=$(get_version_component_range 1-2)
|
||||
|
||||
if [[ -n ${PATCHSET} ]]; then
|
||||
if [[ ${PVR} == ${PV} ]]; then
|
||||
PATCHSET="${PV}-r0.${PATCHSET}"
|
||||
else
|
||||
PATCHSET="${PVR}.${PATCHSET}"
|
||||
fi
|
||||
else
|
||||
PATCHSET="${PVR}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="An object-oriented scripting language"
|
||||
HOMEPAGE="http://www.ruby-lang.org/"
|
||||
SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
|
||||
http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
|
||||
|
||||
LICENSE="|| ( Ruby GPL-2 )"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
|
||||
|
||||
RDEPEND="
|
||||
berkdb? ( sys-libs/db )
|
||||
gdbm? ( sys-libs/gdbm )
|
||||
ssl? ( >=dev-libs/openssl-0.9.8m )
|
||||
socks5? ( >=net-proxy/dante-1.1.13 )
|
||||
tk? ( dev-lang/tk[threads=] )
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
libedit? ( dev-libs/libedit )
|
||||
!libedit? ( readline? ( sys-libs/readline ) )
|
||||
sys-libs/zlib
|
||||
>=app-admin/eselect-ruby-20100603
|
||||
!<dev-ruby/rdoc-2"
|
||||
DEPEND="${RDEPEND}"
|
||||
PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
|
||||
epatch "${WORKDIR}/patches"
|
||||
|
||||
# Fix a hardcoded lib path in configure script
|
||||
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
|
||||
configure.in || die "sed failed"
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=
|
||||
|
||||
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
|
||||
filter-flags -fomit-frame-pointer
|
||||
# In many places aliasing rules are broken; play it safe
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
# set and socks library is present, so need to unset
|
||||
# SOCKS_SERVER in that case.
|
||||
unset SOCKS_SERVER
|
||||
fi
|
||||
|
||||
# Increase GC_MALLOC_LIMIT if set (default is 8000000)
|
||||
if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
|
||||
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
|
||||
fi
|
||||
|
||||
# ipv6 hack, bug 168939. Needs --enable-ipv6.
|
||||
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
|
||||
|
||||
if use libedit; then
|
||||
einfo "Using libedit to provide readline extension"
|
||||
myconf="${myconf} --enable-libedit --with-readline"
|
||||
elif use readline; then
|
||||
einfo "Using readline to provide readline extension"
|
||||
myconf="${myconf} --with-readline"
|
||||
else
|
||||
myconf="${myconf} --without-readline"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="${MY_SUFFIX}" \
|
||||
--enable-shared \
|
||||
$(use_enable socks5 socks) \
|
||||
$(use_enable doc install-doc) \
|
||||
$(use_enable threads pthread) \
|
||||
--enable-ipv6 \
|
||||
$(use_enable debug) \
|
||||
$(use_with berkdb dbm) \
|
||||
$(use_with gdbm) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_with tk) \
|
||||
$(use_with ncurses curses) \
|
||||
${myconf} \
|
||||
--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
|
||||
--enable-option-checking=no \
|
||||
|| die "econf failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 test || die "make test failed"
|
||||
|
||||
elog "Ruby's make test has been run. Ruby also ships with a make check"
|
||||
elog "that cannot be run until after ruby has been installed."
|
||||
elog
|
||||
if use rubytests; then
|
||||
elog "You have enabled rubytests, so they will be installed to"
|
||||
elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
|
||||
elog "than root, and you must place them into a writeable directory."
|
||||
elog "Then call: "
|
||||
elog
|
||||
elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
|
||||
else
|
||||
elog "Enable the rubytests USE flag to install the make check tests"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Ruby is involved in the install process, we don't want interference here.
|
||||
unset RUBYOPT
|
||||
|
||||
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
|
||||
|
||||
LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
|
||||
RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
|
||||
for d in $(find "${S}/ext" -type d) ; do
|
||||
RUBYLIB="${RUBYLIB}:$d"
|
||||
done
|
||||
export LD_LIBRARY_PATH RUBYLIB
|
||||
|
||||
emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
|
||||
keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
|
||||
|
||||
if use doc; then
|
||||
make DESTDIR="${D}" install-doc || die "make install-doc failed"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r sample
|
||||
fi
|
||||
|
||||
dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
|
||||
"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
|
||||
dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
|
||||
"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
|
||||
|
||||
dodoc ChangeLog NEWS README* ToDo || die
|
||||
|
||||
if use rubytests; then
|
||||
pushd test
|
||||
insinto /usr/share/${PN}-${SLOT}/test
|
||||
doins -r .
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
|
||||
eselect ruby set ruby${MY_SUFFIX}
|
||||
fi
|
||||
|
||||
elog
|
||||
elog "To switch between available Ruby profiles, execute as root:"
|
||||
elog "\teselect ruby set ruby(18|19|...)"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect ruby cleanup
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST ocaml-data-notation-0.0.8.tar.gz 59640 SHA256 282151dc5cbe24f09587f58587e3f191426833edb6a70081565225cbc34265d0 SHA512 11fab1a720b86e2912cd62a2f7286f44c3b6c887ae6d6e63fee33fa63bb59f1867086d8bffc3a1803d056b840d8a0a32cef55dea7448e47035154809a9a6192e WHIRLPOOL 7e39f182dcc305c6e1dffefcb951e0a9816245460cd08ea2d1ed925d94a1e819450fbf661e954f5511776ab04e3dc41569b0ecc7ca4e08650c051ebee508cbf7
|
||||
DIST ocaml-data-notation-0.0.9.tar.gz 61607 SHA256 c03556cd4416a3017ef3f316142b75e7989c41374f6e3c17a247e32eca0db7b7 SHA512 bc9b4b2991191163a017de53b2aec44180a497d12c1065f0d91d6f0cb18cf14ff5d80e7d41ecf85146e024fd2e477d08648fa571c4e2e023631e5a3153bec5e7 WHIRLPOOL 73528aa5009cf3f2a4ac3ad5686a6fb9f32c5c0a2843069dd760bcdf60adddf763df8bc053191d700f96838a5dfd646796aaef04fb970d9b9893c9b17fb0ffc5
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.9.ebuild,v 1.1 2012/07/07 16:20:06 aballier Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
OASIS_BUILD_TESTS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="This project uses type-conv to dump OCaml data structure using OCaml data notation"
|
||||
HOMEPAGE="http://forge.ocamlcore.org/projects/odn"
|
||||
SRC_URI="http://forge.ocamlcore.org/frs/download.php/881/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-ml/type-conv-3.0.5"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-ml/ounit[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] )"
|
||||
|
||||
DOCS=( "README.txt" "AUTHORS.txt" "CHANGES.txt" )
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ml/tyxml/tyxml-2.1-r1.ebuild,v 1.1 2012/07/06 16:14:12 aballier Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils findlib
|
||||
|
||||
DESCRIPTION="A libary to build xml trees typechecked by OCaml"
|
||||
HOMEPAGE="http://ocsigen.org/tyxml/"
|
||||
SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1-linking-exception"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc ocamlduce +ocamlopt"
|
||||
|
||||
DEPEND="
|
||||
>=dev-lang/ocaml-3.12[ocamlopt?]
|
||||
dev-ml/ocamlnet
|
||||
ocamlduce? ( dev-ml/ocamlduce )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
export myopts="OCAMLDUCE=$(usex ocamlduce yes no)"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use ocamlopt; then
|
||||
emake "$myopts"
|
||||
else
|
||||
emake "$myopts" byte
|
||||
fi
|
||||
use doc && emake doc "$myopts"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
findlib_src_preinst
|
||||
if use ocamlopt; then
|
||||
emake DESTIR="${D}" "$myopts" install
|
||||
else
|
||||
emake DESTIR="${D}" "$myopts" install-byte
|
||||
fi
|
||||
dodoc CHANGES README
|
||||
use doc && dohtml -r doc/api-html
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/CHI/CHI-0.550.0.ebuild,v 1.1 2012/07/07 17:07:42 tove Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
MODULE_AUTHOR=JSWARTZ
|
||||
MODULE_VERSION=0.55
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Unified cache handling interface"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/Hash-MoreUtils
|
||||
>=dev-perl/Carp-Assert-0.200.0
|
||||
dev-perl/String-RewritePrefix
|
||||
>=dev-perl/Log-Any-0.140.0
|
||||
>=dev-perl/List-MoreUtils-0.330.0
|
||||
dev-perl/Moose
|
||||
>=dev-perl/Try-Tiny-0.110.0
|
||||
>=dev-perl/Time-Duration-Parse-0.60.0
|
||||
>=dev-perl/Time-Duration-1.60.0
|
||||
dev-perl/Data-UUID
|
||||
dev-perl/Digest-JHash
|
||||
dev-perl/TimeDate
|
||||
dev-perl/JSON
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-perl/Test-Deep
|
||||
dev-perl/Test-Exception
|
||||
dev-perl/Test-Class
|
||||
dev-perl/Test-Warn
|
||||
)"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1 +1,2 @@
|
||||
DIST CHI-0.54.tar.gz 83478 SHA256 74314016baf75b9e75f0b8e77b1211c4b4337b74f0bfe5a5cab33f6967bbf655 SHA512 42a07b161a42672aa4c5c3d4bb4d31bb72f7bb6df1578f2a092138d6e308e3f39c4f177ec80e1caef14b50b12683155498a73af9327ab15bedb5e19b97afaecb WHIRLPOOL f57809da0f327ccc5a5d3038891efac0a96deca4e0d2f42a33c440d4ae1423a4f3f54497f3179edb17617ed949373eda7250b83396688fbed19a54870b3d4252
|
||||
DIST CHI-0.55.tar.gz 84503 SHA256 2cf453c40527ed288521bbc93bdd06de7f6707b0b724e975ace711e53c956a8c SHA512 925afd6a0f55dc506aca1ac825eb44e0355de2dfcddc27a101b05c618e7b63e348a3a64f1b23377d5b6e5abff995cf3acd7387f72a32cdb0910a993e70128f19 WHIRLPOOL 27937b1c33943e0d26a27f4440fb3d5b2f008672c0ce3242876a3ca2171057d86c103c74e06121ae86caba8f50e7e4d8f8b4455ea225dc8945a873b327be4386
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.100.0.ebuild,v 1.1 2012/07/07 17:12:54 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=XAOC
|
||||
MODULE_VERSION=1.100
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl interface to the cairo library"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=x11-libs/cairo-1.0.0
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/extutils-depends-0.205.0
|
||||
>=dev-perl/extutils-pkgconfig-1.70.0
|
||||
test? (
|
||||
dev-perl/Test-Number-Delta
|
||||
)
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
|
||||
src_prepare() {
|
||||
perl-module_src_prepare
|
||||
sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST Cairo-1.090.tar.gz 105523 SHA256 ea6b53ffbb632035633f89dc096e4fe3ef1d69de09768e5a1a4e78a26f2d6c01 SHA512 14e9874bcc8098ef5aa16f2f2e88c457301ae4f10ff9cb99b6d5f7a3e69b717762595de08181bb67a72c1951a9ab97886166b21009f25397415eb7000ef5ad3a WHIRLPOOL 652e6c72997991f8281e84e94ba74ac95dc2e20ebbae79be62c7af164b66ba187392cecbc1845fe9e4feee399297a76489d7a8a2be26a62073d1cd16e75ce0af
|
||||
DIST Cairo-1.100.tar.gz 107654 SHA256 d5f2f3ba216db760eaa2b4aefe8519451f4f38dc0121dd0adfeb3d20de51b20a SHA512 f4c9b3a101b01486d0e357d23e34c21a36e557677a57663765055674d9b878564948d4880e408420eb17f39386c137aaf3fbc036b964eb330785e97de2dfcb22 WHIRLPOOL 6338fb36ecbcabe922f32c64ae484052a240da3a8786ab3c64387b0d4faf756e58fa5d4ab9de618fef8cca504cfc9e12110460497ff5261f337802f7855632e3
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Glib-1.242.tar.gz 275868 SHA256 0ebb78bcb3d10c9564473b084ef2989cf86347c1ba4acd5e55bc6c46b6d08d78 SHA512 cefacc831d5a9c46a16503ed9717ef5dde65f148f8a772fa48e66a335e89709480e237ea694a68d98566ea8b864f0c1dfc3c628b68060763fc373ab515cf0441 WHIRLPOOL ad2064b62eada131fd954d43499263d4c3580b9c4a87fbd742f54ef31a29a22738cf88a4ed5187d7cdd334b767536d2c60c23b13059baa7eb75f65fcfedaa1dd
|
||||
DIST Glib-1.260.tar.gz 278587 SHA256 db01e042278b6cd64a0be7bbb5b2432da236ec4f4bfb472d3ab5b2fe07c105a3 SHA512 caba28fb40d284b711b96c165913fb6b83b24839189731344722011d714c3db9f228d2780843a602b87ea32ff34641b9d517e3168662e31fa30558e38493b473 WHIRLPOOL 89c20ccce0737fb805a336479af73558f52f1c6ae0c70ab88435e033c6c9496f0fd28a507a533cba4db3b271f3fbd5b62b007ac682f8492243bc2999a561b6ad
|
||||
DIST Glib-1.261.tar.gz 280601 SHA256 016be02ffbbbc05441e4ba55641ce15f84bedb52e3c3af6fe5271b1b2ea2ce78 SHA512 0e54079f4a53484c94046957056f0b6fe0dae5fe9e37dae22e3ed3d39c3479cac13a5344571539b6dab2aeefda776741e36090a011655db9911db15fc510f094 WHIRLPOOL f29dfbbfc14a496837732e0611a949b1315999aa5ce73475e3995d8dd0b99bae1170ac72fb5a2198e285e3345ed7383062b8190fc3547cfeafaf5cb54d77ffac
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.261.0.ebuild,v 1.1 2012/07/07 17:16:14 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MY_PN=Glib
|
||||
MODULE_AUTHOR=XAOC
|
||||
MODULE_VERSION=1.261
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
|
||||
HOMEPAGE="http://gtk2-perl.sf.net/"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
>=dev-perl/extutils-pkgconfig-1.0
|
||||
>=dev-perl/extutils-depends-0.300"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1 +1 @@
|
||||
DIST Gauche-cdb-0.3.1.tar.gz 72048 RMD160 16b48710ddaf01b8ccc5c2c0beed47398fcd1426 SHA1 c39cc8cfe17525cd58954c2ff80d06d2ddfcbe90 SHA256 2c050a10e0ab6ee67a6fcb8538bbe7ad7ab11b567b4bc15f921c3f13bbf8f842
|
||||
DIST Gauche-cdb-0.3.1.tar.gz 72048 SHA256 2c050a10e0ab6ee67a6fcb8538bbe7ad7ab11b567b4bc15f921c3f13bbf8f842 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68 WHIRLPOOL f408df4e876c602cb105eb3befcb1073ea4c12b002c47c03b7f6ee8d3b5a01e28e529159ace2dd1e32cd5508d9ac70c785bc22b3ff23656c46d9ea5310263c0c
|
||||
|
||||
@ -1 +1 @@
|
||||
DIST Gauche-qdbm-0.2.tar.gz 73311 RMD160 e81bef17c2875191b084a0f57c658b39aa8d2c08 SHA1 d5b0959c1578c777fb46eb840d7b08943cfc2706 SHA256 457957e079c562151c4b82484e716b4749b77e64a5212ecc74db10e928426359
|
||||
DIST Gauche-qdbm-0.2.tar.gz 73311 SHA256 457957e079c562151c4b82484e716b4749b77e64a5212ecc74db10e928426359 SHA512 9286d22f1ad32f213c34670ca0a3fef4d43da8d7e0bed019cd5891400eb7337cd3adfb7cc788350e1f1ab535b87af0fa0a6096d33fa73da6049888ce0006e821 WHIRLPOOL 0f201b3a624200cc37bd741c5f9f522428cf8793c87f6cdda6f874f99f3624554c4deaa0eb078da827ed39dee69f62613984d104da644abd611962d7a4e48fce
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
diff -up tkimg1.4/libtiff/configure.libtiff tkimg1.4/libtiff/configure
|
||||
--- tkimg1.4/libtiff/configure.libtiff 2010-07-07 04:09:46.000000000 -0400
|
||||
+++ tkimg1.4/libtiff/configure 2011-08-01 15:49:04.039079729 -0400
|
||||
@@ -5183,17 +5183,6 @@ mv -f tifftcl_confdefs.h confdefs.h
|
||||
|
||||
|
||||
vars="
|
||||
- ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c
|
||||
- ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c
|
||||
- ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c
|
||||
- ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c
|
||||
- ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c
|
||||
- ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c
|
||||
- ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c
|
||||
- ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c
|
||||
- ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c
|
||||
- ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c
|
||||
- ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c
|
||||
"
|
||||
for i in $vars; do
|
||||
case $i in
|
||||
@@ -5574,7 +5563,7 @@ if test "${TEA_PLATFORM}" = "windows" ;
|
||||
else
|
||||
CLEANFILES=""
|
||||
|
||||
- vars="../compat/libtiff/libtiff/tif_unix.c"
|
||||
+ vars=""
|
||||
for i in $vars; do
|
||||
case $i in
|
||||
\$*)
|
||||
@@ -6053,7 +6042,7 @@ $as_echo "$tcl_cv_cc_visibility_hidden"
|
||||
if test $tcl_cv_cc_visibility_hidden = yes; then :
|
||||
|
||||
|
||||
-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
|
||||
+$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
diff -up tkimg1.4/libtiff/Makefile.in.libtiff tkimg1.4/libtiff/Makefile.in
|
||||
--- tkimg1.4/libtiff/Makefile.in.libtiff 2010-07-07 07:08:08.000000000 -0400
|
||||
+++ tkimg1.4/libtiff/Makefile.in 2011-08-01 15:49:04.040079716 -0400
|
||||
@@ -35,8 +35,8 @@
|
||||
|
||||
# tif_fax3sm is special. It is generated.
|
||||
|
||||
-PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c
|
||||
-PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
|
||||
+PKG_SOURCES = @PKG_SOURCES@
|
||||
+PKG_OBJECTS = @PKG_OBJECTS@
|
||||
|
||||
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
|
||||
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
|
||||
@@ -109,7 +109,7 @@ RANLIB = @RANLIB@
|
||||
RANLIB_STUB = @RANLIB_STUB@
|
||||
SHLIB_CFLAGS = @SHLIB_CFLAGS@
|
||||
SHLIB_LD = @SHLIB_LD@
|
||||
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
|
||||
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ltiff
|
||||
STLIB_LD = @STLIB_LD@
|
||||
TCL_DEFS = @TCL_DEFS@
|
||||
TCL_BIN_DIR = @TCL_BIN_DIR@
|
||||
diff -up tkimg1.4/libtiff/tifftclDecls.h.libtiff tkimg1.4/libtiff/tifftclDecls.h
|
||||
--- tkimg1.4/libtiff/tifftclDecls.h.libtiff 2010-07-07 07:08:08.000000000 -0400
|
||||
+++ tkimg1.4/libtiff/tifftclDecls.h 2011-08-01 15:49:04.041079703 -0400
|
||||
@@ -34,9 +34,13 @@ EXTERN int Tifftcl_SafeInit(Tcl_Interp *
|
||||
*/
|
||||
#undef INLINE
|
||||
|
||||
-#include "../compat/libtiff/libtiff/tiffio.h"
|
||||
-#include "../compat/libtiff/libtiff/tiffiop.h"
|
||||
-#include "../compat/libtiff/libtiff/tif_predict.h"
|
||||
+#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h>
|
||||
+
|
||||
+/*
|
||||
+ * Typedefs for ``method pointers'' used internally.
|
||||
+ */
|
||||
+typedef unsigned char tidataval_t; /* internal image data value type */
|
||||
+typedef tidataval_t* tidata_t; /* reference to internal image data */
|
||||
|
||||
/* !BEGIN!: Do not edit below this line. */
|
||||
|
||||
diff -up tkimg1.4/tiff/configure.libtiff tkimg1.4/tiff/configure
|
||||
--- tkimg1.4/tiff/configure.libtiff 2010-07-13 11:44:38.000000000 -0400
|
||||
+++ tkimg1.4/tiff/configure 2011-08-01 15:49:04.044079664 -0400
|
||||
@@ -5753,7 +5753,7 @@ fi
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
|
||||
- vars="tiff.c tiffJpeg.c tiffZip.c tiffPixar.c"
|
||||
+ vars="tiff.c"
|
||||
for i in $vars; do
|
||||
case $i in
|
||||
\$*)
|
||||
diff -up tkimg1.4/tiff/tiff.c.libtiff tkimg1.4/tiff/tiff.c
|
||||
--- tkimg1.4/tiff/tiff.c.libtiff 2010-07-08 06:41:55.000000000 -0400
|
||||
+++ tkimg1.4/tiff/tiff.c 2011-08-01 15:51:27.451272526 -0400
|
||||
@@ -124,14 +124,14 @@ SetupTiffLibrary (interp)
|
||||
if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) {
|
||||
return TCL_ERROR;
|
||||
}
|
||||
- TIFFRegisterCODEC (COMPRESSION_DEFLATE, "Deflate", TkimgTIFFInitZip);
|
||||
- TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TkimgTIFFInitZip);
|
||||
+ TIFFRegisterCODEC (COMPRESSION_DEFLATE, "Deflate", TIFFInitZIP);
|
||||
+ TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TIFFInitZIP);
|
||||
|
||||
if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) {
|
||||
return TCL_ERROR;
|
||||
}
|
||||
- TIFFRegisterCODEC (COMPRESSION_JPEG, "JPEG", TkimgTIFFInitJpeg);
|
||||
- TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TkimgTIFFInitPixar);
|
||||
+ TIFFRegisterCODEC (COMPRESSION_JPEG, "JPEG", TIFFInitJPEG);
|
||||
+ TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TIFFInitPixarLog);
|
||||
}
|
||||
}
|
||||
return TCL_OK;
|
||||
@ -0,0 +1,720 @@
|
||||
diff -up tkimg1.4/libtiff/tifftclDecls.h.tiff4 tkimg1.4/libtiff/tifftclDecls.h
|
||||
--- tkimg1.4/libtiff/tifftclDecls.h.tiff4 2012-05-07 10:55:28.696144380 -0400
|
||||
+++ tkimg1.4/libtiff/tifftclDecls.h 2012-05-07 10:55:28.720144199 -0400
|
||||
@@ -58,18 +58,18 @@ TIFFTCLAPI TIFFCodec * TIFFRegisterCODEC
|
||||
/* 3 */
|
||||
TIFFTCLAPI void TIFFUnRegisterCODEC(TIFFCodec *a);
|
||||
/* 4 */
|
||||
-TIFFTCLAPI tdata_t _TIFFmalloc(tsize_t a);
|
||||
+TIFFTCLAPI tdata_t _TIFFmalloc(tmsize_t a);
|
||||
/* 5 */
|
||||
-TIFFTCLAPI tdata_t _TIFFrealloc(tdata_t a, tsize_t b);
|
||||
+TIFFTCLAPI tdata_t _TIFFrealloc(void *a, tmsize_t b);
|
||||
/* 6 */
|
||||
-TIFFTCLAPI void _TIFFmemset(tdata_t a, int b, tsize_t c);
|
||||
+TIFFTCLAPI void _TIFFmemset(void *a, int b, tmsize_t c);
|
||||
/* 7 */
|
||||
-TIFFTCLAPI void _TIFFmemcpy(tdata_t a, const tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI void _TIFFmemcpy(void *a, const void *b, tmsize_t c);
|
||||
/* 8 */
|
||||
-TIFFTCLAPI int _TIFFmemcmp(const tdata_t a, const tdata_t b,
|
||||
- tsize_t c);
|
||||
+TIFFTCLAPI int _TIFFmemcmp(const void *a, const void *b,
|
||||
+ tmsize_t c);
|
||||
/* 9 */
|
||||
-TIFFTCLAPI void _TIFFfree(tdata_t a);
|
||||
+TIFFTCLAPI void _TIFFfree(void *a);
|
||||
/* 10 */
|
||||
TIFFTCLAPI void TIFFClose(TIFF *tiffptr);
|
||||
/* 11 */
|
||||
@@ -77,30 +77,30 @@ TIFFTCLAPI int TIFFFlush(TIFF *tiffptr)
|
||||
/* 12 */
|
||||
TIFFTCLAPI int TIFFFlushData(TIFF *tiffptr);
|
||||
/* 13 */
|
||||
-TIFFTCLAPI int TIFFGetField(TIFF *tiffptr, ttag_t a, ...);
|
||||
+TIFFTCLAPI int TIFFGetField(TIFF *tiffptr, uint32 a, ...);
|
||||
/* 14 */
|
||||
-TIFFTCLAPI int TIFFVGetField(TIFF *tiffptr, ttag_t a, va_list b);
|
||||
+TIFFTCLAPI int TIFFVGetField(TIFF *tiffptr, uint32 a, va_list b);
|
||||
/* 15 */
|
||||
-TIFFTCLAPI int TIFFGetFieldDefaulted(TIFF *tiffptr, ttag_t a, ...);
|
||||
+TIFFTCLAPI int TIFFGetFieldDefaulted(TIFF *tiffptr, uint32 a, ...);
|
||||
/* 16 */
|
||||
-TIFFTCLAPI int TIFFVGetFieldDefaulted(TIFF *tiffptr, ttag_t a,
|
||||
+TIFFTCLAPI int TIFFVGetFieldDefaulted(TIFF *tiffptr, uint32 a,
|
||||
va_list b);
|
||||
/* 17 */
|
||||
TIFFTCLAPI int TIFFReadDirectory(TIFF *tiffptr);
|
||||
/* 18 */
|
||||
-TIFFTCLAPI tsize_t TIFFScanlineSize(TIFF *tiffptr);
|
||||
+TIFFTCLAPI tmsize_t TIFFScanlineSize(TIFF *tiffptr);
|
||||
/* 19 */
|
||||
-TIFFTCLAPI tsize_t TIFFRasterScanlineSize(TIFF *tiffptr);
|
||||
+TIFFTCLAPI tmsize_t TIFFRasterScanlineSize(TIFF *tiffptr);
|
||||
/* 20 */
|
||||
-TIFFTCLAPI tsize_t TIFFStripSize(TIFF *tiffptr);
|
||||
+TIFFTCLAPI tmsize_t TIFFStripSize(TIFF *tiffptr);
|
||||
/* 21 */
|
||||
-TIFFTCLAPI tsize_t TIFFVStripSize(TIFF *tiffptr, uint32 a);
|
||||
+TIFFTCLAPI tmsize_t TIFFVStripSize(TIFF *tiffptr, uint32 a);
|
||||
/* 22 */
|
||||
-TIFFTCLAPI tsize_t TIFFTileRowSize(TIFF *tiffptr);
|
||||
+TIFFTCLAPI tmsize_t TIFFTileRowSize(TIFF *tiffptr);
|
||||
/* 23 */
|
||||
-TIFFTCLAPI tsize_t TIFFTileSize(TIFF *tiffptr);
|
||||
+TIFFTCLAPI tmsize_t TIFFTileSize(TIFF *tiffptr);
|
||||
/* 24 */
|
||||
-TIFFTCLAPI tsize_t TIFFVTileSize(TIFF *tiffptr, uint32 a);
|
||||
+TIFFTCLAPI tmsize_t TIFFVTileSize(TIFF *tiffptr, uint32 a);
|
||||
/* 25 */
|
||||
TIFFTCLAPI uint32 TIFFDefaultStripSize(TIFF *tiffptr, uint32 a);
|
||||
/* 26 */
|
||||
@@ -121,21 +121,21 @@ TIFFTCLAPI int TIFFIsMSB2LSB(TIFF *tiff
|
||||
/* 33 */
|
||||
TIFFTCLAPI uint32 TIFFCurrentRow(TIFF *tiffptr);
|
||||
/* 34 */
|
||||
-TIFFTCLAPI tdir_t TIFFCurrentDirectory(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint16 TIFFCurrentDirectory(TIFF *tiffptr);
|
||||
/* 35 */
|
||||
-TIFFTCLAPI tdir_t TIFFNumberOfDirectories(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint16 TIFFNumberOfDirectories(TIFF *tiffptr);
|
||||
/* 36 */
|
||||
-TIFFTCLAPI uint32 TIFFCurrentDirOffset(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint64 TIFFCurrentDirOffset(TIFF *tiffptr);
|
||||
/* 37 */
|
||||
-TIFFTCLAPI tstrip_t TIFFCurrentStrip(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint32 TIFFCurrentStrip(TIFF *tiffptr);
|
||||
/* 38 */
|
||||
-TIFFTCLAPI ttile_t TIFFCurrentTile(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint32 TIFFCurrentTile(TIFF *tiffptr);
|
||||
/* 39 */
|
||||
-TIFFTCLAPI int TIFFReadBufferSetup(TIFF *tiffptr, tdata_t a,
|
||||
- tsize_t b);
|
||||
+TIFFTCLAPI int TIFFReadBufferSetup(TIFF *tiffptr, void *a,
|
||||
+ tmsize_t b);
|
||||
/* 40 */
|
||||
-TIFFTCLAPI int TIFFWriteBufferSetup(TIFF *tiffptr, tdata_t a,
|
||||
- tsize_t b);
|
||||
+TIFFTCLAPI int TIFFWriteBufferSetup(TIFF *tiffptr, void *a,
|
||||
+ tmsize_t b);
|
||||
/* 41 */
|
||||
TIFFTCLAPI int TIFFWriteCheck(TIFF *tiffptr, int a, const char *b);
|
||||
/* 42 */
|
||||
@@ -143,33 +143,31 @@ TIFFTCLAPI int TIFFCreateDirectory(TIFF
|
||||
/* 43 */
|
||||
TIFFTCLAPI int TIFFLastDirectory(TIFF *tiffptr);
|
||||
/* 44 */
|
||||
-TIFFTCLAPI int TIFFSetDirectory(TIFF *tiffptr, tdir_t a);
|
||||
+TIFFTCLAPI int TIFFSetDirectory(TIFF *tiffptr, uint16 a);
|
||||
/* 45 */
|
||||
-TIFFTCLAPI int TIFFSetSubDirectory(TIFF *tiffptr, uint32 a);
|
||||
+TIFFTCLAPI int TIFFSetSubDirectory(TIFF *tiffptr, uint64 a);
|
||||
/* 46 */
|
||||
-TIFFTCLAPI int TIFFUnlinkDirectory(TIFF *tiffptr, tdir_t a);
|
||||
+TIFFTCLAPI int TIFFUnlinkDirectory(TIFF *tiffptr, uint16 a);
|
||||
/* 47 */
|
||||
-TIFFTCLAPI int TIFFSetField(TIFF *tiffptr, ttag_t a, ...);
|
||||
+TIFFTCLAPI int TIFFSetField(TIFF *tiffptr, uint32 a, ...);
|
||||
/* 48 */
|
||||
-TIFFTCLAPI int TIFFVSetField(TIFF *tiffptr, ttag_t a, va_list b);
|
||||
+TIFFTCLAPI int TIFFVSetField(TIFF *tiffptr, uint32 a, va_list b);
|
||||
/* 49 */
|
||||
TIFFTCLAPI int TIFFWriteDirectory(TIFF *tiffptr);
|
||||
/* 50 */
|
||||
-TIFFTCLAPI int TIFFReassignTagToIgnore(enum TIFFIgnoreSense a,
|
||||
- int b);
|
||||
/* 51 */
|
||||
TIFFTCLAPI void TIFFPrintDirectory(TIFF *tiffptr, FILE *a, long b);
|
||||
/* 52 */
|
||||
-TIFFTCLAPI int TIFFReadScanline(TIFF *tiffptr, tdata_t a, uint32 b,
|
||||
- tsample_t c);
|
||||
+TIFFTCLAPI int TIFFReadScanline(TIFF *tiffptr, void *a, uint32 b,
|
||||
+ uint16 c);
|
||||
/* 53 */
|
||||
-TIFFTCLAPI int TIFFWriteScanline(TIFF *tiffptr, tdata_t a, uint32 b,
|
||||
- tsample_t c);
|
||||
+TIFFTCLAPI int TIFFWriteScanline(TIFF *tiffptr, void *a, uint32 b,
|
||||
+ uint16 c);
|
||||
/* 54 */
|
||||
TIFFTCLAPI int TIFFReadRGBAImage(TIFF *tiffptr, uint32 a, uint32 b,
|
||||
uint32 *c, int d);
|
||||
/* 55 */
|
||||
-TIFFTCLAPI int TIFFReadRGBAStrip(TIFF *tiffptr, tstrip_t a,
|
||||
+TIFFTCLAPI int TIFFReadRGBAStrip(TIFF *tiffptr, uint32 a,
|
||||
uint32 *b);
|
||||
/* 56 */
|
||||
TIFFTCLAPI int TIFFReadRGBATile(TIFF *tiffptr, uint32 a, uint32 b,
|
||||
@@ -207,48 +205,48 @@ TIFFTCLAPI TIFFErrorHandler TIFFSetWarni
|
||||
/* 69 */
|
||||
TIFFTCLAPI TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc a);
|
||||
/* 70 */
|
||||
-TIFFTCLAPI ttile_t TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
|
||||
- uint32 c, tsample_t d);
|
||||
+TIFFTCLAPI uint32 TIFFComputeTile(TIFF *tiffptr, uint32 a, uint32 b,
|
||||
+ uint32 c, uint16 d);
|
||||
/* 71 */
|
||||
TIFFTCLAPI int TIFFCheckTile(TIFF *tiffptr, uint32 d, uint32 c,
|
||||
- uint32 b, tsample_t a);
|
||||
+ uint32 b, uint16 a);
|
||||
/* 72 */
|
||||
-TIFFTCLAPI ttile_t TIFFNumberOfTiles(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint32 TIFFNumberOfTiles(TIFF *tiffptr);
|
||||
/* 73 */
|
||||
-TIFFTCLAPI tsize_t TIFFReadTile(TIFF *tiffptr, tdata_t a, uint32 b,
|
||||
- uint32 c, uint32 d, tsample_t e);
|
||||
+TIFFTCLAPI tmsize_t TIFFReadTile(TIFF *tiffptr, void *a, uint32 b,
|
||||
+ uint32 c, uint32 d, uint16 e);
|
||||
/* 74 */
|
||||
-TIFFTCLAPI tsize_t TIFFWriteTile(TIFF *tiffptr, tdata_t e, uint32 d,
|
||||
- uint32 c, uint32 b, tsample_t a);
|
||||
+TIFFTCLAPI tmsize_t TIFFWriteTile(TIFF *tiffptr, void *e, uint32 d,
|
||||
+ uint32 c, uint32 b, uint16 a);
|
||||
/* 75 */
|
||||
-TIFFTCLAPI tstrip_t TIFFComputeStrip(TIFF *tiffptr, uint32 a,
|
||||
- tsample_t b);
|
||||
+TIFFTCLAPI uint32 TIFFComputeStrip(TIFF *tiffptr, uint32 a,
|
||||
+ uint16 b);
|
||||
/* 76 */
|
||||
-TIFFTCLAPI tstrip_t TIFFNumberOfStrips(TIFF *tiffptr);
|
||||
+TIFFTCLAPI uint32 TIFFNumberOfStrips(TIFF *tiffptr);
|
||||
/* 77 */
|
||||
-TIFFTCLAPI tsize_t TIFFReadEncodedStrip(TIFF *tiffptr, tstrip_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFReadEncodedStrip(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 78 */
|
||||
-TIFFTCLAPI tsize_t TIFFReadRawStrip(TIFF *tiffptr, tstrip_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFReadRawStrip(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 79 */
|
||||
-TIFFTCLAPI tsize_t TIFFReadEncodedTile(TIFF *tiffptr, ttile_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFReadEncodedTile(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 80 */
|
||||
-TIFFTCLAPI tsize_t TIFFReadRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
|
||||
- tsize_t a);
|
||||
+TIFFTCLAPI tmsize_t TIFFReadRawTile(TIFF *tiffptr, uint32 c, void *b,
|
||||
+ tmsize_t a);
|
||||
/* 81 */
|
||||
-TIFFTCLAPI tsize_t TIFFWriteEncodedStrip(TIFF *tiffptr, tstrip_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFWriteEncodedStrip(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 82 */
|
||||
-TIFFTCLAPI tsize_t TIFFWriteRawStrip(TIFF *tiffptr, tstrip_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFWriteRawStrip(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 83 */
|
||||
-TIFFTCLAPI tsize_t TIFFWriteEncodedTile(TIFF *tiffptr, ttile_t a,
|
||||
- tdata_t b, tsize_t c);
|
||||
+TIFFTCLAPI tmsize_t TIFFWriteEncodedTile(TIFF *tiffptr, uint32 a,
|
||||
+ void *b, tmsize_t c);
|
||||
/* 84 */
|
||||
-TIFFTCLAPI tsize_t TIFFWriteRawTile(TIFF *tiffptr, ttile_t c, tdata_t b,
|
||||
- tsize_t a);
|
||||
+TIFFTCLAPI tmsize_t TIFFWriteRawTile(TIFF *tiffptr, uint32 c, void *b,
|
||||
+ tmsize_t a);
|
||||
/* 85 */
|
||||
TIFFTCLAPI void TIFFSetWriteOffset(TIFF *tiffptr, toff_t a);
|
||||
/* 86 */
|
||||
@@ -258,13 +256,13 @@ TIFFTCLAPI void TIFFSwabLong(uint32 *a)
|
||||
/* 88 */
|
||||
TIFFTCLAPI void TIFFSwabDouble(double *a);
|
||||
/* 89 */
|
||||
-TIFFTCLAPI void TIFFSwabArrayOfShort(uint16 *a, unsigned long b);
|
||||
+TIFFTCLAPI void TIFFSwabArrayOfShort(uint16 *a, tmsize_t b);
|
||||
/* 90 */
|
||||
-TIFFTCLAPI void TIFFSwabArrayOfLong(uint32 *b, unsigned long a);
|
||||
+TIFFTCLAPI void TIFFSwabArrayOfLong(uint32 *b, tmsize_t a);
|
||||
/* 91 */
|
||||
-TIFFTCLAPI void TIFFSwabArrayOfDouble(double *a, unsigned long b);
|
||||
+TIFFTCLAPI void TIFFSwabArrayOfDouble(double *a, tmsize_t b);
|
||||
/* 92 */
|
||||
-TIFFTCLAPI void TIFFReverseBits(unsigned char *a, unsigned long b);
|
||||
+TIFFTCLAPI void TIFFReverseBits(uint8 *a, tmsize_t b);
|
||||
/* 93 */
|
||||
TIFFTCLAPI const unsigned char * TIFFGetBitRevTable(int a);
|
||||
/* Slot 94 is reserved */
|
||||
@@ -273,8 +271,6 @@ TIFFTCLAPI const unsigned char * TIFFGet
|
||||
/* Slot 97 is reserved */
|
||||
/* Slot 98 is reserved */
|
||||
/* Slot 99 is reserved */
|
||||
-/* 100 */
|
||||
-TIFFTCLAPI int TIFFPredictorInit(TIFF *tiffptr);
|
||||
/* Slot 101 is reserved */
|
||||
/* Slot 102 is reserved */
|
||||
/* Slot 103 is reserved */
|
||||
@@ -285,20 +281,13 @@ TIFFTCLAPI int TIFFPredictorInit(TIFF *
|
||||
/* Slot 108 is reserved */
|
||||
/* Slot 109 is reserved */
|
||||
/* 110 */
|
||||
-TIFFTCLAPI void _TIFFSetupFieldInfo(TIFF *tiffptr,
|
||||
- const TIFFFieldInfo a[], size_t b);
|
||||
/* 111 */
|
||||
-TIFFTCLAPI int _TIFFMergeFieldInfo(TIFF *tiffptr,
|
||||
- const TIFFFieldInfo *a, int b);
|
||||
/* 112 */
|
||||
TIFFTCLAPI void _TIFFPrintFieldInfo(TIFF *tiffptr, FILE *a);
|
||||
/* 113 */
|
||||
-TIFFTCLAPI const TIFFFieldInfo * TIFFFindFieldInfo(TIFF *tiffptr, ttag_t a,
|
||||
- TIFFDataType b);
|
||||
/* 114 */
|
||||
-TIFFTCLAPI const TIFFFieldInfo * TIFFFieldWithTag(TIFF *tiffptr, ttag_t a);
|
||||
+TIFFTCLAPI const TIFFField * TIFFFieldWithTag(TIFF *tiffptr, uint32 a);
|
||||
/* 115 */
|
||||
-TIFFTCLAPI TIFFDataType _TIFFSampleToTagType(TIFF *tiffptr);
|
||||
/* Slot 116 is reserved */
|
||||
/* Slot 117 is reserved */
|
||||
/* Slot 118 is reserved */
|
||||
@@ -306,43 +295,42 @@ TIFFTCLAPI TIFFDataType _TIFFSampleToTa
|
||||
/* 120 */
|
||||
TIFFTCLAPI int _TIFFgetMode(const char *a, const char *b);
|
||||
/* 121 */
|
||||
-TIFFTCLAPI int _TIFFNoRowEncode(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b, tsample_t c);
|
||||
+TIFFTCLAPI int _TIFFNoRowEncode(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b, uint16 c);
|
||||
/* 122 */
|
||||
-TIFFTCLAPI int _TIFFNoStripEncode(TIFF *tiffptr, tidata_t c,
|
||||
- tsize_t b, tsample_t a);
|
||||
+TIFFTCLAPI int _TIFFNoStripEncode(TIFF *tiffptr, uint8 *c,
|
||||
+ tmsize_t b, uint16 a);
|
||||
/* 123 */
|
||||
-TIFFTCLAPI int _TIFFNoTileEncode(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b, tsample_t c);
|
||||
+TIFFTCLAPI int _TIFFNoTileEncode(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b, uint16 c);
|
||||
/* 124 */
|
||||
-TIFFTCLAPI int _TIFFNoRowDecode(TIFF *tiffptr, tidata_t c,
|
||||
- tsize_t b, tsample_t a);
|
||||
+TIFFTCLAPI int _TIFFNoRowDecode(TIFF *tiffptr, uint8 *c,
|
||||
+ tmsize_t b, uint16 a);
|
||||
/* 125 */
|
||||
-TIFFTCLAPI int _TIFFNoStripDecode(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b, tsample_t c);
|
||||
+TIFFTCLAPI int _TIFFNoStripDecode(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b, uint16 c);
|
||||
/* 126 */
|
||||
-TIFFTCLAPI int _TIFFNoTileDecode(TIFF *tiffptr, tidata_t c,
|
||||
- tsize_t b, tsample_t a);
|
||||
+TIFFTCLAPI int _TIFFNoTileDecode(TIFF *tiffptr, uint8 *c,
|
||||
+ tmsize_t b, uint16 a);
|
||||
/* 127 */
|
||||
-TIFFTCLAPI void _TIFFNoPostDecode(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b);
|
||||
+TIFFTCLAPI void _TIFFNoPostDecode(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b);
|
||||
/* 128 */
|
||||
-TIFFTCLAPI int _TIFFNoPreCode(TIFF *tiffptr, tsample_t a);
|
||||
+TIFFTCLAPI int _TIFFNoPreCode(TIFF *tiffptr, uint16 a);
|
||||
/* 129 */
|
||||
TIFFTCLAPI int _TIFFNoSeek(TIFF *tiffptr, uint32 a);
|
||||
/* 130 */
|
||||
-TIFFTCLAPI void _TIFFSwab16BitData(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b);
|
||||
+TIFFTCLAPI void _TIFFSwab16BitData(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b);
|
||||
/* 131 */
|
||||
-TIFFTCLAPI void _TIFFSwab32BitData(TIFF *tiffptr, tidata_t b,
|
||||
- tsize_t a);
|
||||
+TIFFTCLAPI void _TIFFSwab32BitData(TIFF *tiffptr, uint8 *b,
|
||||
+ tmsize_t a);
|
||||
/* 132 */
|
||||
-TIFFTCLAPI void _TIFFSwab64BitData(TIFF *tiffptr, tidata_t a,
|
||||
- tsize_t b);
|
||||
+TIFFTCLAPI void _TIFFSwab64BitData(TIFF *tiffptr, uint8 *a,
|
||||
+ tmsize_t b);
|
||||
/* 133 */
|
||||
TIFFTCLAPI int TIFFFlushData1(TIFF *tiffptr);
|
||||
/* 134 */
|
||||
-TIFFTCLAPI void TIFFFreeDirectory(TIFF *tiffptr);
|
||||
/* 135 */
|
||||
TIFFTCLAPI int TIFFDefaultDirectory(TIFF *tiffptr);
|
||||
/* 136 */
|
||||
@@ -401,6 +389,8 @@ TIFFTCLAPI int TIFFInitZIP(TIFF *tiffpt
|
||||
TIFFTCLAPI int TIFFInitPixarLog(TIFF *tiffptr, int a);
|
||||
/* 162 */
|
||||
TIFFTCLAPI int TIFFInitSGILog(TIFF *tiffptr, int a);
|
||||
+/* 163 */
|
||||
+TIFFTCLAPI int TIFFInitLZMA(TIFF *tiffptr, int a);
|
||||
|
||||
typedef struct TifftclStubs {
|
||||
int magic;
|
||||
@@ -410,27 +400,27 @@ typedef struct TifftclStubs {
|
||||
const TIFFCodec * (*tIFFFindCODEC) (uint16 a); /* 1 */
|
||||
TIFFCodec * (*tIFFRegisterCODEC) (uint16 a, const char *b, TIFFInitMethod c); /* 2 */
|
||||
void (*tIFFUnRegisterCODEC) (TIFFCodec *a); /* 3 */
|
||||
- tdata_t (*_TIFFmallocPtr) (tsize_t a); /* 4 */
|
||||
- tdata_t (*_TIFFreallocPtr) (tdata_t a, tsize_t b); /* 5 */
|
||||
- void (*_TIFFmemsetPtr) (tdata_t a, int b, tsize_t c); /* 6 */
|
||||
- void (*_TIFFmemcpyPtr) (tdata_t a, const tdata_t b, tsize_t c); /* 7 */
|
||||
- int (*_TIFFmemcmpPtr) (const tdata_t a, const tdata_t b, tsize_t c); /* 8 */
|
||||
- void (*_TIFFfreePtr) (tdata_t a); /* 9 */
|
||||
+ tdata_t (*_TIFFmallocPtr) (tmsize_t a); /* 4 */
|
||||
+ tdata_t (*_TIFFreallocPtr) (void *a, tmsize_t b); /* 5 */
|
||||
+ void (*_TIFFmemsetPtr) (void *a, int b, tmsize_t c); /* 6 */
|
||||
+ void (*_TIFFmemcpyPtr) (void *a, const void *b, tmsize_t c); /* 7 */
|
||||
+ int (*_TIFFmemcmpPtr) (const void *a, const void *b, tmsize_t c); /* 8 */
|
||||
+ void (*_TIFFfreePtr) (void *a); /* 9 */
|
||||
void (*tIFFClose) (TIFF *tiffptr); /* 10 */
|
||||
int (*tIFFFlush) (TIFF *tiffptr); /* 11 */
|
||||
int (*tIFFFlushData) (TIFF *tiffptr); /* 12 */
|
||||
- int (*tIFFGetField) (TIFF *tiffptr, ttag_t a, ...); /* 13 */
|
||||
- int (*tIFFVGetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 14 */
|
||||
- int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, ...); /* 15 */
|
||||
- int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, ttag_t a, va_list b); /* 16 */
|
||||
+ int (*tIFFGetField) (TIFF *tiffptr, uint32 a, ...); /* 13 */
|
||||
+ int (*tIFFVGetField) (TIFF *tiffptr, uint32 a, va_list b); /* 14 */
|
||||
+ int (*tIFFGetFieldDefaulted) (TIFF *tiffptr, uint32 a, ...); /* 15 */
|
||||
+ int (*tIFFVGetFieldDefaulted) (TIFF *tiffptr, uint32 a, va_list b); /* 16 */
|
||||
int (*tIFFReadDirectory) (TIFF *tiffptr); /* 17 */
|
||||
- tsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
|
||||
- tsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
|
||||
- tsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
|
||||
- tsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
|
||||
- tsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
|
||||
- tsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
|
||||
- tsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
|
||||
+ tmsize_t (*tIFFScanlineSize) (TIFF *tiffptr); /* 18 */
|
||||
+ tmsize_t (*tIFFRasterScanlineSize) (TIFF *tiffptr); /* 19 */
|
||||
+ tmsize_t (*tIFFStripSize) (TIFF *tiffptr); /* 20 */
|
||||
+ tmsize_t (*tIFFVStripSize) (TIFF *tiffptr, uint32 a); /* 21 */
|
||||
+ tmsize_t (*tIFFTileRowSize) (TIFF *tiffptr); /* 22 */
|
||||
+ tmsize_t (*tIFFTileSize) (TIFF *tiffptr); /* 23 */
|
||||
+ tmsize_t (*tIFFVTileSize) (TIFF *tiffptr, uint32 a); /* 24 */
|
||||
uint32 (*tIFFDefaultStripSize) (TIFF *tiffptr, uint32 a); /* 25 */
|
||||
void (*tIFFDefaultTileSize) (TIFF *tiffptr, uint32 *a, uint32 *b); /* 26 */
|
||||
int (*tIFFFileno) (TIFF *tiffptr); /* 27 */
|
||||
@@ -440,28 +430,28 @@ typedef struct TifftclStubs {
|
||||
int (*tIFFIsUpSampled) (TIFF *tiffptr); /* 31 */
|
||||
int (*tIFFIsMSB2LSB) (TIFF *tiffptr); /* 32 */
|
||||
uint32 (*tIFFCurrentRow) (TIFF *tiffptr); /* 33 */
|
||||
- tdir_t (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
|
||||
- tdir_t (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
|
||||
- uint32 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
|
||||
- tstrip_t (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
|
||||
- ttile_t (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
|
||||
- int (*tIFFReadBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 39 */
|
||||
- int (*tIFFWriteBufferSetup) (TIFF *tiffptr, tdata_t a, tsize_t b); /* 40 */
|
||||
+ uint16 (*tIFFCurrentDirectory) (TIFF *tiffptr); /* 34 */
|
||||
+ uint16 (*tIFFNumberOfDirectories) (TIFF *tiffptr); /* 35 */
|
||||
+ uint64 (*tIFFCurrentDirOffset) (TIFF *tiffptr); /* 36 */
|
||||
+ uint32 (*tIFFCurrentStrip) (TIFF *tiffptr); /* 37 */
|
||||
+ uint32 (*tIFFCurrentTile) (TIFF *tiffptr); /* 38 */
|
||||
+ int (*tIFFReadBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 39 */
|
||||
+ int (*tIFFWriteBufferSetup) (TIFF *tiffptr, void *a, tmsize_t b); /* 40 */
|
||||
int (*tIFFWriteCheck) (TIFF *tiffptr, int a, const char *b); /* 41 */
|
||||
int (*tIFFCreateDirectory) (TIFF *tiffptr); /* 42 */
|
||||
int (*tIFFLastDirectory) (TIFF *tiffptr); /* 43 */
|
||||
- int (*tIFFSetDirectory) (TIFF *tiffptr, tdir_t a); /* 44 */
|
||||
- int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint32 a); /* 45 */
|
||||
- int (*tIFFUnlinkDirectory) (TIFF *tiffptr, tdir_t a); /* 46 */
|
||||
- int (*tIFFSetField) (TIFF *tiffptr, ttag_t a, ...); /* 47 */
|
||||
- int (*tIFFVSetField) (TIFF *tiffptr, ttag_t a, va_list b); /* 48 */
|
||||
+ int (*tIFFSetDirectory) (TIFF *tiffptr, uint16 a); /* 44 */
|
||||
+ int (*tIFFSetSubDirectory) (TIFF *tiffptr, uint64 a); /* 45 */
|
||||
+ int (*tIFFUnlinkDirectory) (TIFF *tiffptr, uint16 a); /* 46 */
|
||||
+ int (*tIFFSetField) (TIFF *tiffptr, uint32 a, ...); /* 47 */
|
||||
+ int (*tIFFVSetField) (TIFF *tiffptr, uint32 a, va_list b); /* 48 */
|
||||
int (*tIFFWriteDirectory) (TIFF *tiffptr); /* 49 */
|
||||
- int (*tIFFReassignTagToIgnore) (enum TIFFIgnoreSense a, int b); /* 50 */
|
||||
+ void (*reserved50)(void);
|
||||
void (*tIFFPrintDirectory) (TIFF *tiffptr, FILE *a, long b); /* 51 */
|
||||
- int (*tIFFReadScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 52 */
|
||||
- int (*tIFFWriteScanline) (TIFF *tiffptr, tdata_t a, uint32 b, tsample_t c); /* 53 */
|
||||
+ int (*tIFFReadScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 52 */
|
||||
+ int (*tIFFWriteScanline) (TIFF *tiffptr, void *a, uint32 b, uint16 c); /* 53 */
|
||||
int (*tIFFReadRGBAImage) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c, int d); /* 54 */
|
||||
- int (*tIFFReadRGBAStrip) (TIFF *tiffptr, tstrip_t a, uint32 *b); /* 55 */
|
||||
+ int (*tIFFReadRGBAStrip) (TIFF *tiffptr, uint32 a, uint32 *b); /* 55 */
|
||||
int (*tIFFReadRGBATile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 *c); /* 56 */
|
||||
int (*tIFFRGBAImageOK) (TIFF *tiffptr, char *a); /* 57 */
|
||||
int (*tIFFRGBAImageBegin) (TIFFRGBAImage *a, TIFF *tiffptr, int b, char *c); /* 58 */
|
||||
@@ -476,29 +466,29 @@ typedef struct TifftclStubs {
|
||||
TIFFErrorHandler (*tIFFSetErrorHandler) (TIFFErrorHandler a); /* 67 */
|
||||
TIFFErrorHandler (*tIFFSetWarningHandler) (TIFFErrorHandler a); /* 68 */
|
||||
TIFFExtendProc (*tIFFSetTagExtender) (TIFFExtendProc a); /* 69 */
|
||||
- ttile_t (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, tsample_t d); /* 70 */
|
||||
- int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, tsample_t a); /* 71 */
|
||||
- ttile_t (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
|
||||
- tsize_t (*tIFFReadTile) (TIFF *tiffptr, tdata_t a, uint32 b, uint32 c, uint32 d, tsample_t e); /* 73 */
|
||||
- tsize_t (*tIFFWriteTile) (TIFF *tiffptr, tdata_t e, uint32 d, uint32 c, uint32 b, tsample_t a); /* 74 */
|
||||
- tstrip_t (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, tsample_t b); /* 75 */
|
||||
- tstrip_t (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
|
||||
- tsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 77 */
|
||||
- tsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 78 */
|
||||
- tsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 79 */
|
||||
- tsize_t (*tIFFReadRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 80 */
|
||||
- tsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 81 */
|
||||
- tsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, tstrip_t a, tdata_t b, tsize_t c); /* 82 */
|
||||
- tsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, ttile_t a, tdata_t b, tsize_t c); /* 83 */
|
||||
- tsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, ttile_t c, tdata_t b, tsize_t a); /* 84 */
|
||||
+ uint32 (*tIFFComputeTile) (TIFF *tiffptr, uint32 a, uint32 b, uint32 c, uint16 d); /* 70 */
|
||||
+ int (*tIFFCheckTile) (TIFF *tiffptr, uint32 d, uint32 c, uint32 b, uint16 a); /* 71 */
|
||||
+ uint32 (*tIFFNumberOfTiles) (TIFF *tiffptr); /* 72 */
|
||||
+ tmsize_t (*tIFFReadTile) (TIFF *tiffptr, void *a, uint32 b, uint32 c, uint32 d, uint16 e); /* 73 */
|
||||
+ tmsize_t (*tIFFWriteTile) (TIFF *tiffptr, void *e, uint32 d, uint32 c, uint32 b, uint16 a); /* 74 */
|
||||
+ uint32 (*tIFFComputeStrip) (TIFF *tiffptr, uint32 a, uint16 b); /* 75 */
|
||||
+ uint32 (*tIFFNumberOfStrips) (TIFF *tiffptr); /* 76 */
|
||||
+ tmsize_t (*tIFFReadEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 77 */
|
||||
+ tmsize_t (*tIFFReadRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 78 */
|
||||
+ tmsize_t (*tIFFReadEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 79 */
|
||||
+ tmsize_t (*tIFFReadRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 80 */
|
||||
+ tmsize_t (*tIFFWriteEncodedStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 81 */
|
||||
+ tmsize_t (*tIFFWriteRawStrip) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 82 */
|
||||
+ tmsize_t (*tIFFWriteEncodedTile) (TIFF *tiffptr, uint32 a, void *b, tmsize_t c); /* 83 */
|
||||
+ tmsize_t (*tIFFWriteRawTile) (TIFF *tiffptr, uint32 c, void *b, tmsize_t a); /* 84 */
|
||||
void (*tIFFSetWriteOffset) (TIFF *tiffptr, toff_t a); /* 85 */
|
||||
void (*tIFFSwabShort) (uint16 *a); /* 86 */
|
||||
void (*tIFFSwabLong) (uint32 *a); /* 87 */
|
||||
void (*tIFFSwabDouble) (double *a); /* 88 */
|
||||
- void (*tIFFSwabArrayOfShort) (uint16 *a, unsigned long b); /* 89 */
|
||||
- void (*tIFFSwabArrayOfLong) (uint32 *b, unsigned long a); /* 90 */
|
||||
- void (*tIFFSwabArrayOfDouble) (double *a, unsigned long b); /* 91 */
|
||||
- void (*tIFFReverseBits) (unsigned char *a, unsigned long b); /* 92 */
|
||||
+ void (*tIFFSwabArrayOfShort) (uint16 *a, tmsize_t b); /* 89 */
|
||||
+ void (*tIFFSwabArrayOfLong) (uint32 *b, tmsize_t a); /* 90 */
|
||||
+ void (*tIFFSwabArrayOfDouble) (double *a, tmsize_t b); /* 91 */
|
||||
+ void (*tIFFReverseBits) (unsigned char *a, tmsize_t b); /* 92 */
|
||||
const unsigned char * (*tIFFGetBitRevTable) (int a); /* 93 */
|
||||
void (*reserved94)(void);
|
||||
void (*reserved95)(void);
|
||||
@@ -506,7 +496,7 @@ typedef struct TifftclStubs {
|
||||
void (*reserved97)(void);
|
||||
void (*reserved98)(void);
|
||||
void (*reserved99)(void);
|
||||
- int (*tIFFPredictorInit) (TIFF *tiffptr); /* 100 */
|
||||
+ void (*reserved100)(void);
|
||||
void (*reserved101)(void);
|
||||
void (*reserved102)(void);
|
||||
void (*reserved103)(void);
|
||||
@@ -516,31 +506,31 @@ typedef struct TifftclStubs {
|
||||
void (*reserved107)(void);
|
||||
void (*reserved108)(void);
|
||||
void (*reserved109)(void);
|
||||
- void (*_TIFFSetupFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo a[], size_t b); /* 110 */
|
||||
- int (*_TIFFMergeFieldInfoPtr) (TIFF *tiffptr, const TIFFFieldInfo *a, int b); /* 111 */
|
||||
+ void (*reserved110)(void);
|
||||
+ void (*reserved111)(void);
|
||||
void (*_TIFFPrintFieldInfoPtr) (TIFF *tiffptr, FILE *a); /* 112 */
|
||||
- const TIFFFieldInfo * (*tIFFFindFieldInfo) (TIFF *tiffptr, ttag_t a, TIFFDataType b); /* 113 */
|
||||
- const TIFFFieldInfo * (*tIFFFieldWithTag) (TIFF *tiffptr, ttag_t a); /* 114 */
|
||||
- TIFFDataType (*_TIFFSampleToTagTypePtr) (TIFF *tiffptr); /* 115 */
|
||||
+ void (*reserved113)(void);
|
||||
+ const TIFFField * (*tIFFFieldWithTag) (TIFF *tiffptr, uint32 a); /* 114 */
|
||||
+ void (*reserved115)(void);
|
||||
void (*reserved116)(void);
|
||||
void (*reserved117)(void);
|
||||
void (*reserved118)(void);
|
||||
void (*reserved119)(void);
|
||||
int (*_TIFFgetModePtr) (const char *a, const char *b); /* 120 */
|
||||
- int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 121 */
|
||||
- int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 122 */
|
||||
- int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 123 */
|
||||
- int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 124 */
|
||||
- int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b, tsample_t c); /* 125 */
|
||||
- int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, tidata_t c, tsize_t b, tsample_t a); /* 126 */
|
||||
- void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 127 */
|
||||
- int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, tsample_t a); /* 128 */
|
||||
+ int (*_TIFFNoRowEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 121 */
|
||||
+ int (*_TIFFNoStripEncodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 122 */
|
||||
+ int (*_TIFFNoTileEncodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 123 */
|
||||
+ int (*_TIFFNoRowDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 124 */
|
||||
+ int (*_TIFFNoStripDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b, uint16 c); /* 125 */
|
||||
+ int (*_TIFFNoTileDecodePtr) (TIFF *tiffptr, uint8 *c, tmsize_t b, uint16 a); /* 126 */
|
||||
+ void (*_TIFFNoPostDecodePtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 127 */
|
||||
+ int (*_TIFFNoPreCodePtr) (TIFF *tiffptr, uint16 a); /* 128 */
|
||||
int (*_TIFFNoSeekPtr) (TIFF *tiffptr, uint32 a); /* 129 */
|
||||
- void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 130 */
|
||||
- void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, tidata_t b, tsize_t a); /* 131 */
|
||||
- void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, tidata_t a, tsize_t b); /* 132 */
|
||||
+ void (*_TIFFSwab16BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 130 */
|
||||
+ void (*_TIFFSwab32BitDataPtr) (TIFF *tiffptr, uint8 *b, tmsize_t a); /* 131 */
|
||||
+ void (*_TIFFSwab64BitDataPtr) (TIFF *tiffptr, uint8 *a, tmsize_t b); /* 132 */
|
||||
int (*tIFFFlushData1) (TIFF *tiffptr); /* 133 */
|
||||
- void (*tIFFFreeDirectory) (TIFF *tiffptr); /* 134 */
|
||||
+ void (*reserved134)(void);
|
||||
int (*tIFFDefaultDirectory) (TIFF *tiffptr); /* 135 */
|
||||
int (*tIFFSetCompressionScheme) (TIFF *tiffptr, int a); /* 136 */
|
||||
void (*_TIFFSetDefaultCompressionStatePtr) (TIFF *tiffptr); /* 137 */
|
||||
@@ -569,6 +559,7 @@ typedef struct TifftclStubs {
|
||||
int (*tIFFInitZIP) (TIFF *tiffptr, int a); /* 160 */
|
||||
int (*tIFFInitPixarLog) (TIFF *tiffptr, int a); /* 161 */
|
||||
int (*tIFFInitSGILog) (TIFF *tiffptr, int a); /* 162 */
|
||||
+ int (*tIFFInitLZMA) (TIFF *tiffptr, int a); /* 163 */
|
||||
} TifftclStubs;
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -685,8 +676,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
|
||||
(tifftclStubsPtr->tIFFVSetField) /* 48 */
|
||||
#define TIFFWriteDirectory \
|
||||
(tifftclStubsPtr->tIFFWriteDirectory) /* 49 */
|
||||
-#define TIFFReassignTagToIgnore \
|
||||
- (tifftclStubsPtr->tIFFReassignTagToIgnore) /* 50 */
|
||||
+/* Slot 50 is reserved */
|
||||
#define TIFFPrintDirectory \
|
||||
(tifftclStubsPtr->tIFFPrintDirectory) /* 51 */
|
||||
#define TIFFReadScanline \
|
||||
@@ -779,8 +769,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
|
||||
/* Slot 97 is reserved */
|
||||
/* Slot 98 is reserved */
|
||||
/* Slot 99 is reserved */
|
||||
-#define TIFFPredictorInit \
|
||||
- (tifftclStubsPtr->tIFFPredictorInit) /* 100 */
|
||||
+/* Slot 100 is reserved */
|
||||
/* Slot 101 is reserved */
|
||||
/* Slot 102 is reserved */
|
||||
/* Slot 103 is reserved */
|
||||
@@ -790,18 +779,14 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
|
||||
/* Slot 107 is reserved */
|
||||
/* Slot 108 is reserved */
|
||||
/* Slot 109 is reserved */
|
||||
-#define _TIFFSetupFieldInfo \
|
||||
- (tifftclStubsPtr->_TIFFSetupFieldInfoPtr) /* 110 */
|
||||
-#define _TIFFMergeFieldInfo \
|
||||
- (tifftclStubsPtr->_TIFFMergeFieldInfoPtr) /* 111 */
|
||||
+/* Slot 110 is reserved */
|
||||
+/* Slot 111 is reserved */
|
||||
#define _TIFFPrintFieldInfo \
|
||||
(tifftclStubsPtr->_TIFFPrintFieldInfoPtr) /* 112 */
|
||||
-#define TIFFFindFieldInfo \
|
||||
- (tifftclStubsPtr->tIFFFindFieldInfo) /* 113 */
|
||||
+/* Slot 113 is reserved */
|
||||
#define TIFFFieldWithTag \
|
||||
(tifftclStubsPtr->tIFFFieldWithTag) /* 114 */
|
||||
-#define _TIFFSampleToTagType \
|
||||
- (tifftclStubsPtr->_TIFFSampleToTagTypePtr) /* 115 */
|
||||
+/* Slot 115 is reserved */
|
||||
/* Slot 116 is reserved */
|
||||
/* Slot 117 is reserved */
|
||||
/* Slot 118 is reserved */
|
||||
@@ -834,8 +819,7 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
|
||||
(tifftclStubsPtr->_TIFFSwab64BitDataPtr) /* 132 */
|
||||
#define TIFFFlushData1 \
|
||||
(tifftclStubsPtr->tIFFFlushData1) /* 133 */
|
||||
-#define TIFFFreeDirectory \
|
||||
- (tifftclStubsPtr->tIFFFreeDirectory) /* 134 */
|
||||
+/* Slot 134 is reserved */
|
||||
#define TIFFDefaultDirectory \
|
||||
(tifftclStubsPtr->tIFFDefaultDirectory) /* 135 */
|
||||
#define TIFFSetCompressionScheme \
|
||||
@@ -892,6 +876,8 @@ TIFFTCLAPI const TifftclStubs *tifftclSt
|
||||
(tifftclStubsPtr->tIFFInitPixarLog) /* 161 */
|
||||
#define TIFFInitSGILog \
|
||||
(tifftclStubsPtr->tIFFInitSGILog) /* 162 */
|
||||
+#define TIFFInitLZMA \
|
||||
+ (tifftclStubsPtr->tIFFInitLZMA) /* 163 */
|
||||
|
||||
#endif /* defined(USE_TIFFTCL_STUBS) */
|
||||
|
||||
diff -up tkimg1.4/libtiff/tifftclStubInit.c.tiff4 tkimg1.4/libtiff/tifftclStubInit.c
|
||||
--- tkimg1.4/libtiff/tifftclStubInit.c.tiff4 2010-06-30 11:03:06.000000000 -0400
|
||||
+++ tkimg1.4/libtiff/tifftclStubInit.c 2012-05-07 10:55:28.721144191 -0400
|
||||
@@ -70,7 +70,7 @@ const TifftclStubs tifftclStubs = {
|
||||
TIFFSetField, /* 47 */
|
||||
TIFFVSetField, /* 48 */
|
||||
TIFFWriteDirectory, /* 49 */
|
||||
- TIFFReassignTagToIgnore, /* 50 */
|
||||
+ 0, /* 50 */
|
||||
TIFFPrintDirectory, /* 51 */
|
||||
TIFFReadScanline, /* 52 */
|
||||
TIFFWriteScanline, /* 53 */
|
||||
@@ -120,7 +120,7 @@ const TifftclStubs tifftclStubs = {
|
||||
0, /* 97 */
|
||||
0, /* 98 */
|
||||
0, /* 99 */
|
||||
- TIFFPredictorInit, /* 100 */
|
||||
+ 0, /* 100 */
|
||||
0, /* 101 */
|
||||
0, /* 102 */
|
||||
0, /* 103 */
|
||||
@@ -130,12 +130,12 @@ const TifftclStubs tifftclStubs = {
|
||||
0, /* 107 */
|
||||
0, /* 108 */
|
||||
0, /* 109 */
|
||||
- _TIFFSetupFieldInfo, /* 110 */
|
||||
- _TIFFMergeFieldInfo, /* 111 */
|
||||
+ 0, /* 110 */
|
||||
+ 0, /* 111 */
|
||||
_TIFFPrintFieldInfo, /* 112 */
|
||||
- TIFFFindFieldInfo, /* 113 */
|
||||
+ 0, /* 113 */
|
||||
TIFFFieldWithTag, /* 114 */
|
||||
- _TIFFSampleToTagType, /* 115 */
|
||||
+ 0, /* 115 */
|
||||
0, /* 116 */
|
||||
0, /* 117 */
|
||||
0, /* 118 */
|
||||
@@ -154,7 +154,7 @@ const TifftclStubs tifftclStubs = {
|
||||
_TIFFSwab32BitData, /* 131 */
|
||||
_TIFFSwab64BitData, /* 132 */
|
||||
TIFFFlushData1, /* 133 */
|
||||
- TIFFFreeDirectory, /* 134 */
|
||||
+ 0, /* 134 */
|
||||
TIFFDefaultDirectory, /* 135 */
|
||||
TIFFSetCompressionScheme, /* 136 */
|
||||
_TIFFSetDefaultCompressionState, /* 137 */
|
||||
@@ -239,6 +239,12 @@ const TifftclStubs tifftclStubs = {
|
||||
#else /* !LOGLUV_SUPPORT */
|
||||
TIFFInitSGILog, /* 162 */
|
||||
#endif /* !LOGLUV_SUPPORT */
|
||||
+#if !defined(LZMA_SUPPORT)
|
||||
+ 0, /* 163 */
|
||||
+#else
|
||||
+ TIFFInitLZMA, /* 163 */
|
||||
+#endif /* !LZMA_SUPPORT */
|
||||
+
|
||||
};
|
||||
|
||||
/* !END!: Do not edit above this line. */
|
||||
diff -up tkimg1.4/tests/tiff.test.tiff4 tkimg1.4/tests/tiff.test
|
||||
--- tkimg1.4/tests/tiff.test.tiff4 2012-05-07 10:59:04.260503681 -0400
|
||||
+++ tkimg1.4/tests/tiff.test 2012-05-07 10:59:26.283349663 -0400
|
||||
@@ -18,10 +18,10 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAA
|
||||
AAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAAB
|
||||
-ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAAC9gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
|
||||
+ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAADBgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
|
||||
AAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEWAAMAAAABAAwAAAEXAAQAAAAB
|
||||
-AAACQAEaAAUAAAABAAAC/AEbAAUAAAABAAADBAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
|
||||
-AAAACAAIAAgSwAAAAAQAABLAAAAABAAA}
|
||||
+AAACQAEaAAUAAAABAAAC9gEbAAUAAAABAAAC/gEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
|
||||
+AAAAAASwAAAAAQAABLAAAAABAAgACAAI}
|
||||
|
||||
test tiff-1.1 {} {
|
||||
catch {image delete i}
|
||||
diff -up tkimg1.4/tiff/tests/tiff.test.tiff4 tkimg1.4/tiff/tests/tiff.test
|
||||
--- tkimg1.4/tiff/tests/tiff.test.tiff4 2012-05-07 11:00:25.993941462 -0400
|
||||
+++ tkimg1.4/tiff/tests/tiff.test 2012-05-07 11:00:44.606813135 -0400
|
||||
@@ -16,10 +16,10 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAA
|
||||
AAAAAADw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4Dw/4AAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAAB
|
||||
-ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAAC9gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
|
||||
+ABAAAAEBAAMAAAABAAwAAAECAAMAAAADAAADBgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAER
|
||||
AAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEWAAMAAAABAAwAAAEXAAQAAAAB
|
||||
-AAACQAEaAAUAAAABAAAC/AEbAAUAAAABAAADBAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
|
||||
-AAAACAAIAAgSwAAAAAQAABLAAAAABAAA}
|
||||
+AAACQAEaAAUAAAABAAAC9gEbAAUAAAABAAAC/gEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAA
|
||||
+AAAAAASwAAAAAQAABLAAAAABAAgACAAI}
|
||||
|
||||
test tiff-1.1 {} {
|
||||
catch {image delete i}
|
||||
diff -up tkimg1.4/tiff/tiff.c.tiff4 tkimg1.4/tiff/tiff.c
|
||||
--- tkimg1.4/tiff/tiff.c.tiff4 2012-05-07 10:55:28.698144366 -0400
|
||||
+++ tkimg1.4/tiff/tiff.c 2012-05-07 10:55:28.722144183 -0400
|
||||
@@ -115,8 +115,8 @@ SetupTiffLibrary (interp)
|
||||
if (!initialized) {
|
||||
initialized = 1;
|
||||
if (
|
||||
- TIFFRegisterCODEC && TIFFError && TIFFPredictorInit &&
|
||||
- _TIFFMergeFieldInfo && TIFFFlushData1 && _TIFFNoPostDecode &&
|
||||
+ TIFFRegisterCODEC && TIFFError &&
|
||||
+ TIFFFlushData1 && _TIFFNoPostDecode &&
|
||||
TIFFTileRowSize && TIFFScanlineSize && _TIFFsetByteArray &&
|
||||
TIFFVSetField && TIFFSwabArrayOfShort
|
||||
) {
|
||||
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild,v 1.1 2012/07/07 14:05:46 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
VIRTUALX_USE=test
|
||||
|
||||
inherit eutils multilib prefix virtualx
|
||||
|
||||
MYP="${PN}${PV}"
|
||||
|
||||
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
|
||||
HOMEPAGE="http://tkimg.sourceforge.net/"
|
||||
SRC_URI="
|
||||
http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
|
||||
mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
|
||||
|
||||
IUSE="doc test"
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/tk
|
||||
>=dev-tcltk/tcllib-1.11
|
||||
media-libs/tiff:0
|
||||
media-libs/libpng:0
|
||||
>=sys-libs/zlib-1.2.6
|
||||
virtual/jpeg"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
x11-apps/xhost
|
||||
media-fonts/font-misc-misc
|
||||
media-fonts/font-cursor-misc )"
|
||||
|
||||
# Fails with jpeg-turbo silently, #386253
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/${MYP}"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
|
||||
"${FILESDIR}"/${P}-jbig.patch \
|
||||
"${FILESDIR}"/${P}-zlib-1.2.6.patch \
|
||||
"${FILESDIR}"/${P}-libtiff.patch \
|
||||
"${FILESDIR}"/${P}-libtiff4.patch
|
||||
|
||||
find compat/{libjpeg,libpng,zlib,libtiff} -delete
|
||||
|
||||
sed \
|
||||
-e 's:-O2 -fomit-frame-pointer::g' \
|
||||
-e 's: -pipe::g' \
|
||||
-i */configure || die
|
||||
|
||||
eprefixify */*.h
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake test || die "Xmake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local l bl
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
INSTALL_ROOT="${D}" \
|
||||
install
|
||||
|
||||
# Make library links
|
||||
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
|
||||
bl=$(basename $l)
|
||||
dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
|
||||
done
|
||||
|
||||
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
|
||||
|
||||
if use doc; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins demo.tcl
|
||||
insinto /usr/share/doc/${PF}/html
|
||||
doins -r doc/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.50.0.ebuild,v 1.1 2012/07/06 22:18:47 floppym Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="python? *"
|
||||
|
||||
inherit eutils flag-o-matic python toolchain-funcs versionator
|
||||
|
||||
MY_PV=$(replace_all_version_separators _)
|
||||
MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
|
||||
|
||||
DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
|
||||
HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
|
||||
SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
|
||||
|
||||
LICENSE="Boost-1.0"
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="examples python"
|
||||
|
||||
DEPEND="!<dev-libs/boost-1.34.0
|
||||
!<=dev-util/boost-build-1.35.0-r1"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
|
||||
|
||||
src_unpack() {
|
||||
tar xjpf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build/v2 || die "unpacking tar failed"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch"
|
||||
epatch "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
|
||||
|
||||
# Remove stripping option
|
||||
cd "${S}/engine"
|
||||
sed -i -e 's|-s\b||' \
|
||||
build.jam || die "sed failed"
|
||||
|
||||
# Force regeneration
|
||||
rm jambase.c || die
|
||||
|
||||
# This patch allows us to fully control optimization
|
||||
# and stripping flags when bjam is used as build-system
|
||||
# We simply extend the optimization and debug-symbols feature
|
||||
# with empty dummies called 'none'
|
||||
cd "${S}"
|
||||
sed -i \
|
||||
-e 's/\(off speed space\)/\1 none/' \
|
||||
-e 's/\(debug-symbols : on off\)/\1 none/' \
|
||||
tools/builtin.jam || die "sed failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd engine
|
||||
local toolset
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
toolset=darwin
|
||||
else
|
||||
# Using boost's generic toolset here, which respects CC and CFLAGS
|
||||
toolset=cc
|
||||
fi
|
||||
|
||||
# For slotting
|
||||
sed -i \
|
||||
-e "s|/usr/share/boost-build|/usr/share/boost-build-${MAJOR_PV}|" \
|
||||
Jambase || die "sed failed"
|
||||
|
||||
# The build.jam file for building bjam using a bootstrapped jam0 ignores
|
||||
# the LDFLAGS env var (bug #209794). We have now two options:
|
||||
# a) change the cc-target definition in build.jam to include separate compile
|
||||
# and link targets to make it use the LDFLAGS var, or
|
||||
# b) a simple dirty workaround by injecting the LDFLAGS in the LIBS env var
|
||||
# (which should not be set by us).
|
||||
if [[ -z "${LDFLAGS}" ]] ; then
|
||||
CC=$(tc-getCC) ./build.sh ${toolset} $(use_with python) \
|
||||
|| die "building bjam failed"
|
||||
else
|
||||
LDFLAGS=$(echo ${LDFLAGS}) # 293652
|
||||
LIBS=${LDFLAGS} CC=$(tc-getCC) ./build.sh ${toolset} \
|
||||
$(use_with python) || die "building bjam failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbin engine/bin.*/bjam bjam-${MAJOR_PV}
|
||||
newbin engine/bin.*/b2 b2-${MAJOR_PV}
|
||||
|
||||
cd "${S}"
|
||||
insinto /usr/share/boost-build-${MAJOR_PV}
|
||||
doins -r boost-build.jam bootstrap.jam build-system.jam site-config.jam user-config.jam \
|
||||
build kernel options tools util || die
|
||||
|
||||
dodoc changes.txt hacking.txt release_procedure.txt \
|
||||
notes/build_dir_option.txt notes/relative_source_paths.txt
|
||||
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r example
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd test/engine
|
||||
|
||||
# FIXME: Replace the ls call with the proper way of doing this.
|
||||
|
||||
BJAM_BIN=$(ls ../../engine/bin.*/b2)
|
||||
${BJAM_BIN} -f test.jam "-sBJAM=${BJAM_BIN}" || die "tests failed"
|
||||
}
|
||||
@ -0,0 +1,376 @@
|
||||
From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Johnson <robbat2@gentoo.org>
|
||||
Date: Sat, 07 Jul 2012 04:21:26 +0000
|
||||
Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
|
||||
utilities
|
||||
|
||||
Forward-ported from 1.7.10.2 to current git.git v1.7.11.1 tag.
|
||||
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/Makefile git-1.7.11.1/Makefile
|
||||
--- git-1.7.11.1.orig/Makefile 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/Makefile 2012-07-06 21:20:03.905680815 -0700
|
||||
@@ -224,6 +224,8 @@
|
||||
#
|
||||
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
|
||||
#
|
||||
+# Define NO_CVS if you do not want any CVS interface utilities.
|
||||
+#
|
||||
# The TCL_PATH variable governs the location of the Tcl interpreter
|
||||
# used to optimize git-gui for your system. Only used if NO_TCLTK
|
||||
# is not set. Defaults to the bare 'tclsh'.
|
||||
@@ -401,6 +403,7 @@
|
||||
PROGRAM_OBJS =
|
||||
PROGRAMS =
|
||||
SCRIPT_PERL =
|
||||
+SCRIPT_PERL_CVS =
|
||||
SCRIPT_PYTHON =
|
||||
SCRIPT_SH =
|
||||
SCRIPT_LIB =
|
||||
@@ -441,18 +444,19 @@
|
||||
SCRIPT_PERL += git-add--interactive.perl
|
||||
SCRIPT_PERL += git-difftool.perl
|
||||
SCRIPT_PERL += git-archimport.perl
|
||||
-SCRIPT_PERL += git-cvsexportcommit.perl
|
||||
-SCRIPT_PERL += git-cvsimport.perl
|
||||
-SCRIPT_PERL += git-cvsserver.perl
|
||||
SCRIPT_PERL += git-relink.perl
|
||||
SCRIPT_PERL += git-send-email.perl
|
||||
SCRIPT_PERL += git-svn.perl
|
||||
|
||||
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsimport.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsserver.perl
|
||||
+
|
||||
SCRIPT_PYTHON += git-remote-testgit.py
|
||||
SCRIPT_PYTHON += git-p4.py
|
||||
|
||||
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
||||
- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
||||
+ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
|
||||
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
||||
git-instaweb
|
||||
|
||||
@@ -2012,13 +2016,25 @@
|
||||
$(QUIET_GEN)$(cmd_munge_script) && \
|
||||
mv $@+ $@
|
||||
|
||||
+_SCRIPT_PERL_BUILD =
|
||||
+_SCRIPT_PERL_NOBUILD =
|
||||
+
|
||||
ifndef NO_PERL
|
||||
-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
||||
+
|
||||
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
|
||||
+
|
||||
+ifndef NO_CVS
|
||||
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
|
||||
+else # NO_CVS
|
||||
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
|
||||
+endif # NO_CVS
|
||||
+
|
||||
+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): perl/perl.mak
|
||||
|
||||
perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
|
||||
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
|
||||
|
||||
-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
||||
+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
||||
sed -e '1{' \
|
||||
@@ -2049,14 +2065,17 @@
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
else # NO_PERL
|
||||
-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
|
||||
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
|
||||
+endif # NO_PERL
|
||||
+
|
||||
+# This is any perl scripts that were disabled it might be empty...
|
||||
+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
|
||||
unimplemented.sh >$@+ && \
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
-endif # NO_PERL
|
||||
|
||||
ifndef NO_PYTHON
|
||||
$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS
|
||||
@@ -2091,7 +2110,7 @@
|
||||
# These can record GIT_VERSION
|
||||
git.o git.spec http.o \
|
||||
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
||||
- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
||||
+ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
|
||||
: GIT-VERSION-FILE
|
||||
|
||||
TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9200-git-cvsexportcommit.sh git-1.7.11.1/t/t9200-git-cvsexportcommit.sh
|
||||
--- git-1.7.11.1.orig/t/t9200-git-cvsexportcommit.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9200-git-cvsexportcommit.sh 2012-07-06 21:18:56.998636736 -0700
|
||||
@@ -12,6 +12,11 @@
|
||||
test_done
|
||||
fi
|
||||
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git cvsexportcommit tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9400-git-cvsserver-server.sh git-1.7.11.1/t/t9400-git-cvsserver-server.sh
|
||||
--- git-1.7.11.1.orig/t/t9400-git-cvsserver-server.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9400-git-cvsserver-server.sh 2012-07-06 21:18:56.998636736 -0700
|
||||
@@ -11,9 +11,15 @@
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq PERL; then
|
||||
- skip_all='skipping git cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
+
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.11.1/t/t9401-git-cvsserver-crlf.sh
|
||||
--- git-1.7.11.1.orig/t/t9401-git-cvsserver-crlf.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9401-git-cvsserver-crlf.sh 2012-07-06 21:18:56.999636748 -0700
|
||||
@@ -38,15 +38,20 @@
|
||||
fi
|
||||
}
|
||||
|
||||
-cvs >/dev/null 2>&1
|
||||
-if test $? -ne 1
|
||||
+if ! test_have_prereq PERL
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
-if ! test_have_prereq PERL
|
||||
+if ! test_have_prereq CVS
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+cvs >/dev/null 2>&1
|
||||
+if test $? -ne 1
|
||||
+then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
test_done
|
||||
fi
|
||||
"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9600-cvsimport.sh git-1.7.11.1/t/t9600-cvsimport.sh
|
||||
--- git-1.7.11.1.orig/t/t9600-cvsimport.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9600-cvsimport.sh 2012-07-06 21:18:57.000636757 -0700
|
||||
@@ -3,14 +3,25 @@
|
||||
test_description='git cvsimport basic tests'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot environment' '
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
+test_expect_success 'setup cvsroot environment' '
|
||||
CVSROOT=$(pwd)/cvsroot &&
|
||||
export CVSROOT
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot' '$CVS init'
|
||||
+test_expect_success 'setup cvsroot' '$CVS init'
|
||||
|
||||
-test_expect_success PERL 'setup a cvs module' '
|
||||
+test_expect_success 'setup a cvs module' '
|
||||
|
||||
mkdir "$CVSROOT/module" &&
|
||||
$CVS co -d module-cvs module &&
|
||||
@@ -42,23 +53,23 @@
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import a trivial module' '
|
||||
+test_expect_success 'import a trivial module' '
|
||||
|
||||
git cvsimport -a -R -z 0 -C module-git module &&
|
||||
test_cmp module-cvs/o_fortuna module-git/o_fortuna
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
|
||||
+test_expect_success 'pack refs' '(cd module-git && git gc)'
|
||||
|
||||
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'initial import has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1) > expected &&
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
(cd module-cvs &&
|
||||
cat <<EOF >o_fortuna &&
|
||||
O Fortune,
|
||||
@@ -86,7 +97,7 @@
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update git module' '
|
||||
+test_expect_success 'update git module' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.trackRevisions true &&
|
||||
@@ -97,7 +108,7 @@
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
|
||||
@@ -105,7 +116,7 @@
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
|
||||
(cd module-cvs &&
|
||||
echo 1 >tick &&
|
||||
@@ -114,7 +125,7 @@
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'cvsimport.module config works' '
|
||||
+test_expect_success 'cvsimport.module config works' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.module module &&
|
||||
@@ -126,7 +137,7 @@
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'second update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
|
||||
@@ -135,7 +146,7 @@
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import from a CVS working tree' '
|
||||
+test_expect_success 'import from a CVS working tree' '
|
||||
|
||||
$CVS co -d import-from-wt module &&
|
||||
(cd import-from-wt &&
|
||||
@@ -148,12 +159,12 @@
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'no .git/cvs-revisions created by default' '
|
||||
+test_expect_success 'no .git/cvs-revisions created by default' '
|
||||
|
||||
! test -e import-from-wt/.git/cvs-revisions
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
|
||||
test_done
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.11.1/t/t9601-cvsimport-vendor-branch.sh
|
||||
--- git-1.7.11.1.orig/t/t9601-cvsimport-vendor-branch.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9601-cvsimport-vendor-branch.sh 2012-07-06 21:18:57.000636757 -0700
|
||||
@@ -34,6 +34,17 @@
|
||||
test_description='git cvsimport handling of vendor branches'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9601
|
||||
|
||||
test_expect_success PERL 'import a module with a vendor branch' '
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.11.1/t/t9602-cvsimport-branches-tags.sh
|
||||
--- git-1.7.11.1.orig/t/t9602-cvsimport-branches-tags.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9602-cvsimport-branches-tags.sh 2012-07-06 21:18:57.001636770 -0700
|
||||
@@ -6,6 +6,17 @@
|
||||
test_description='git cvsimport handling of branches and tags'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9602
|
||||
|
||||
test_expect_success PERL 'import module' '
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/t9603-cvsimport-patchsets.sh git-1.7.11.1/t/t9603-cvsimport-patchsets.sh
|
||||
--- git-1.7.11.1.orig/t/t9603-cvsimport-patchsets.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/t9603-cvsimport-patchsets.sh 2012-07-06 21:18:57.001636770 -0700
|
||||
@@ -14,6 +14,17 @@
|
||||
test_description='git cvsimport testing for correct patchset estimation'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9603
|
||||
|
||||
test_expect_failure 'import with criss cross times on revisions' '
|
||||
diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.11.1.orig/t/test-lib.sh git-1.7.11.1/t/test-lib.sh
|
||||
--- git-1.7.11.1.orig/t/test-lib.sh 2012-06-21 14:55:43.000000000 -0700
|
||||
+++ git-1.7.11.1/t/test-lib.sh 2012-07-06 21:18:57.002636788 -0700
|
||||
@@ -616,6 +616,7 @@
|
||||
esac
|
||||
|
||||
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
|
||||
+test -z "$NO_CVS" && test_set_prereq CVS
|
||||
test -z "$NO_PERL" && test_set_prereq PERL
|
||||
test -z "$NO_PYTHON" && test_set_prereq PYTHON
|
||||
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
|
||||
@ -0,0 +1,559 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.11.1.ebuild,v 1.1 2012/07/07 05:29:55 robbat2 Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_DEPEND="python? 2"
|
||||
[[ ${PV} == *9999 ]] && SCM="git-2"
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
|
||||
inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER=${MY_PV}
|
||||
|
||||
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
|
||||
HOMEPAGE="http://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="gz"
|
||||
SRC_URI_GOOG="http://git-core.googlecode.com/files"
|
||||
SRC_URI_KORG="mirror://kernel/software/scm/git"
|
||||
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="" # Pending git-svn fixes
|
||||
else
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
CDEPEND="
|
||||
!blksha1? ( dev-libs/openssl )
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre )
|
||||
perl? ( dev-lang/perl[-build] )
|
||||
tk? ( dev-lang/tk )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
emacs? ( virtual/emacs )"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? ( dev-perl/Error
|
||||
dev-perl/Net-SMTP-SSL
|
||||
dev-perl/Authen-SASL
|
||||
cgi? ( virtual/perl-CGI app-text/highlight )
|
||||
cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
|
||||
subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
|
||||
)
|
||||
python? ( gtk?
|
||||
(
|
||||
>=dev-python/pygtk-2.8
|
||||
dev-python/pygtksourceview:2
|
||||
) )"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
DEPEND="${CDEPEND}
|
||||
app-arch/cpio
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
sys-apps/texinfo
|
||||
)
|
||||
test? (
|
||||
app-crypt/gnupg
|
||||
)"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
DEPEND="${DEPEND}
|
||||
app-text/asciidoc
|
||||
app-text/xmlto"
|
||||
fi
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
if use python ; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local myopts
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts="${myopts} BLK_SHA1=YesPlease"
|
||||
elif use ppcsha1 ; then
|
||||
myopts="${myopts} PPC_SHA1=YesPlease"
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
|
||||
else
|
||||
myopts="${myopts} NO_CURL=YesPlease"
|
||||
fi
|
||||
|
||||
# broken assumptions, because of broken build system ...
|
||||
myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
|
||||
myopts="${myopts} INSTALL=install TAR=tar"
|
||||
myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
|
||||
myopts="${myopts} SANE_TOOL_PATH="
|
||||
myopts="${myopts} OLD_ICONV="
|
||||
myopts="${myopts} NO_EXTERNAL_GREP="
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
|
||||
|
||||
use iconv \
|
||||
|| myopts="${myopts} NO_ICONV=YesPlease"
|
||||
use nls \
|
||||
|| myopts="${myopts} NO_GETTEXT=YesPlease"
|
||||
use tk \
|
||||
|| myopts="${myopts} NO_TCLTK=YesPlease"
|
||||
use pcre \
|
||||
&& myopts="${myopts} USE_LIBPCRE=yes"
|
||||
use perl \
|
||||
&& myopts="${myopts} INSTALLDIRS=vendor" \
|
||||
|| myopts="${myopts} NO_PERL=YesPlease"
|
||||
use python \
|
||||
|| myopts="${myopts} NO_PYTHON=YesPlease"
|
||||
use subversion \
|
||||
|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
|
||||
use threads \
|
||||
&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
|
||||
use cvs \
|
||||
|| myopts="${myopts} NO_CVS=YesPlease"
|
||||
# Disabled until ~m68k-mint can be keyworded again
|
||||
# if [[ ${CHOST} == *-mint* ]] ; then
|
||||
# myopts="${myopts} NO_MMAP=YesPlease"
|
||||
# myopts="${myopts} NO_IPV6=YesPlease"
|
||||
# myopts="${myopts} NO_STRLCPY=YesPlease"
|
||||
# myopts="${myopts} NO_MEMMEM=YesPlease"
|
||||
# myopts="${myopts} NO_MKDTEMP=YesPlease"
|
||||
# myopts="${myopts} NO_MKSTEMPS=YesPlease"
|
||||
# fi
|
||||
if [[ ${CHOST} == ia64-*-hpux* ]]; then
|
||||
myopts="${myopts} NO_NSEC=YesPlease"
|
||||
fi
|
||||
if [[ ${CHOST} == *-*-aix* ]]; then
|
||||
myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
|
||||
fi
|
||||
|
||||
has_version '>=app-text/asciidoc-8.0' \
|
||||
&& myopts="${myopts} ASCIIDOC8=YesPlease"
|
||||
myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
[[ "${CHOST}" == *-uclibc* ]] && \
|
||||
myopts="${myopts} NO_NSEC=YesPlease"
|
||||
|
||||
export MY_MAKEOPTS="${myopts}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
use doc && \
|
||||
cd "${S}"/Documentation && \
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}"
|
||||
else
|
||||
git-2_src_unpack
|
||||
cd "${S}"
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Noperl is being merged to upstream as of 2009/04/05
|
||||
#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
|
||||
|
||||
# GetOpt-Long v2.38 is strict
|
||||
# Merged in 1.6.3 final 2009/05/07
|
||||
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
|
||||
|
||||
# JS install fixup
|
||||
# Merged in 1.7.5.x
|
||||
#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
|
||||
|
||||
# Fix false positives with t3404 due to SHELL=/bin/false for the portage
|
||||
# user.
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
|
||||
|
||||
# bug #350075: t9001: fix missing prereq on some tests
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
|
||||
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
epatch "${FILESDIR}"/git-1.7.11.1-optional-cvs.patch
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC = \).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR = \).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile || die "sed failed"
|
||||
|
||||
# Never install the private copy of Error.pm (bug #296310)
|
||||
sed -i \
|
||||
-e '/private-Error.pm/s,^,#,' \
|
||||
perl/Makefile.PL
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
|
||||
Documentation/Makefile || die "sed failed"
|
||||
|
||||
# bug #318289
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
|
||||
|
||||
# merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.5-interix.patch
|
||||
|
||||
# merged upstream
|
||||
#epatch "${FILESDIR}"/git-1.7.6-interix.patch
|
||||
|
||||
# Newer versions of SVN hate a whitespace in the file URL.
|
||||
# So we avoid that by replaced the space with an underscore.
|
||||
#Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/
|
||||
#svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool))
|
||||
#
|
||||
# With this change the following tests still fail: t9100 t9118 t9120
|
||||
# Without it, MOST of t91* fails, due to the space tripping up the
|
||||
# svn_uri_is_canonical.
|
||||
#
|
||||
# git-svn actually needs to be fixed here, but this chagne is useful for
|
||||
# testing it.
|
||||
#
|
||||
# This patch is my work to date on fixing git-svn, but it causes more
|
||||
# breakage than it fixes (it's manually-edited now to do nothing).
|
||||
#epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch
|
||||
cd "${S}"/t
|
||||
sed -i \
|
||||
-e 's/trash directory/trash_directory/g' \
|
||||
test-lib.sh t0000-basic.sh Makefile || die "sed failed"
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #326625: PERL_PATH, PERL_MM_OPT
|
||||
# bug #320647: PYTHON_PATH
|
||||
PYTHON_PATH=""
|
||||
use python && PYTHON_PATH="$(PYTHON -a)"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
DESTDIR="${D}" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
PERL_MM_OPT="" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
"$@"
|
||||
# This is the fix for bug #326625, but it also causes breakage, see bug
|
||||
# #352693.
|
||||
# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el \
|
||||
|| die "emacs modules failed"
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb/gitweb.cgi \
|
||||
|| die "emake gitweb/gitweb.cgi failed"
|
||||
fi
|
||||
|
||||
cd "${S}"/Documentation
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake \
|
||||
install || \
|
||||
die "make install failed"
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
|
||||
dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
use doc && dohtml -p ${d} Documentation${d}*.html
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc} || die
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
|
||||
fi
|
||||
|
||||
if use python && use gtk ; then
|
||||
dobin "${S}"/contrib/gitview/gitview
|
||||
python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
|
||||
dodoc "${S}"/contrib/gitview/gitview.txt
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
newbin contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
for i in \
|
||||
blameview buildsystems ciabot continuous convert-objects fast-import \
|
||||
hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
|
||||
stats svn-fe vim workdir \
|
||||
; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym /usr/share/gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
find "${ED}"/usr/lib64/perl5/ \
|
||||
-name .packlist \
|
||||
-exec rm \{\} \;
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/git-daemon.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
|
||||
fixlocalpod
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=""
|
||||
local tests_cvs="t9200-git-cvsexportcommit.sh \
|
||||
t9400-git-cvsserver-server.sh \
|
||||
t9401-git-cvsserver-crlf.sh \
|
||||
t9600-cvsimport.sh \
|
||||
t9601-cvsimport-vendor-branch.sh \
|
||||
t9602-cvsimport-branches-tags.sh \
|
||||
t9603-cvsimport-patchsets.sh"
|
||||
local tests_perl="t5502-quickfetch.sh \
|
||||
t5512-ls-remote.sh \
|
||||
t5520-pull.sh"
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot="t0001-init.sh \
|
||||
t0004-unwritable.sh \
|
||||
t0070-fundamental.sh \
|
||||
t1004-read-tree-m-u-wf.sh \
|
||||
t3700-add.sh \
|
||||
t7300-clean.sh"
|
||||
# t9100 t9118 t9120 all fail with SVN 1.7, despite the workaround for spaces
|
||||
# in the test directory.
|
||||
local test_svn="t9100-git-svn-basic.sh \
|
||||
t9118-git-svn-funky-branch-names.sh \
|
||||
t9120-git-svn-clone-with-percent-escapes.sh"
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled="${disabled} t5000-tar-tree.sh"
|
||||
fi
|
||||
|
||||
cvs=0
|
||||
use cvs && let cvs=$cvs+1
|
||||
if [[ ${EUID} -eq 0 ]]; then
|
||||
if [[ $cvs -eq 1 ]]; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled="${disabled} ${tests_cvs}"
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled="${disabled} ${tests_nonroot}"
|
||||
else
|
||||
[[ $cvs -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=$cvs+1
|
||||
[[ $cvs -gt 1 ]] && \
|
||||
built_with_use dev-vcs/cvs server && \
|
||||
let cvs=$cvs+1
|
||||
if [[ $cvs -lt 3 ]]; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled="${disabled} ${tests_cvs}"
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled="${disabled} ${tests_perl}"
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled="${disabled} ${test_svn}"
|
||||
|
||||
# Reset all previously disabled tests
|
||||
cd "${S}/t"
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i "${S}"/t/Makefile
|
||||
|
||||
# Clean old results first, must always run
|
||||
cd "${S}/t"
|
||||
nonfatal git_emake clean
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
cd "${S}"
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
cd "${S}/t"
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[ $rc -eq 0 ] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
use python && python_mod_optimize git_remote_helpers
|
||||
einfo "Please read /usr/share/bash-completion/git for Git bash completion"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache )"
|
||||
echo
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
use python && python_mod_cleanup git_remote_helpers
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST gnome-applets-2.32.1.1.tar.bz2 10083534 RMD160 50c8e169b02aa002917f4c6ea0f575522e3ae984 SHA1 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327
|
||||
DIST gnome-applets-3.2.1.tar.xz 8032112 RMD160 35a99d55308a5292b5a4e8b1e073db730b35a3f4 SHA1 99fc40a80197edd84649b7d5243d2c8645a90104 SHA256 cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1
|
||||
DIST gnome-applets-3.4.1.tar.xz 8000232 RMD160 32978ca01d7e03b53f1120e92e507ccc3096e5ce SHA1 1a49f5da5d198c4d2e1e96d2f18608b98d7ba770 SHA256 ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e
|
||||
DIST gnome-applets-2.32.1.1.tar.bz2 10083534 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327 SHA512 2fa14922d55e24187714e3fc71e8b225a64efc1c7c10d33a7058cb8912a571abf1b545028604430a1fc5c75aa9202ee35f611ead2e435c6f1c532ca912792403 WHIRLPOOL 0528accfb0fc9f94407ae2b05656a51909f7e1976a713783687809989e65715d52b1530a637c185aa37958039b4b8dec3125c553c807a6b665f78c173ecf481e
|
||||
DIST gnome-applets-3.2.1.tar.xz 8032112 SHA256 cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1
|
||||
DIST gnome-applets-3.4.1.tar.xz 8000232 SHA256 ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e
|
||||
|
||||
@ -0,0 +1,137 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r1.ebuild,v 1.1 2012/07/07 12:36:48 pacho Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME_TARBALL_SUFFIX="bz2"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
|
||||
inherit eutils gnome2 python autotools
|
||||
|
||||
DESCRIPTION="Applets for the GNOME Desktop and Panel"
|
||||
HOMEPAGE="http://www.gnome.org/"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.1 LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
|
||||
IUSE="+cpufreq gstreamer ipv6 networkmanager policykit"
|
||||
|
||||
# TODO: configure says python stuff is optional
|
||||
# null applet still needs bonobo support for gnome-panel
|
||||
RDEPEND=">=x11-libs/gtk+-2.20:2
|
||||
>=dev-libs/glib-2.22:2
|
||||
>=gnome-base/gconf-2.8:2
|
||||
>=gnome-base/gnome-panel-2.31.2[bonobo]
|
||||
>=x11-libs/libxklavier-4.0
|
||||
>=x11-libs/libwnck-2.9.3:1
|
||||
>=gnome-base/gnome-desktop-2.11.1:2
|
||||
>=x11-libs/libnotify-0.3.2
|
||||
>=sys-apps/dbus-1.1.2
|
||||
>=dev-libs/dbus-glib-0.74
|
||||
>=dev-libs/libxml2-2.5.0:2
|
||||
>=x11-themes/gnome-icon-theme-2.15.91
|
||||
>=dev-libs/libgweather-2.22.1:2
|
||||
<dev-libs/libgweather-2.91:2
|
||||
x11-libs/libX11
|
||||
|
||||
gnome-base/gnome-settings-daemon
|
||||
gnome-base/libgnome
|
||||
>=gnome-extra/gucharmap-2.23:0
|
||||
>=gnome-base/libgtop-2.11.92:2
|
||||
>=dev-python/pygobject-2.6:2
|
||||
>=dev-python/pygtk-2.6:2
|
||||
>=dev-python/gconf-python-2.10:2
|
||||
>=dev-python/gnome-applets-python-2.10
|
||||
|
||||
cpufreq? ( sys-power/cpufrequtils )
|
||||
gstreamer? (
|
||||
>=media-libs/gstreamer-0.10.2:0.10
|
||||
>=media-libs/gst-plugins-base-0.10.14:0.10
|
||||
|| (
|
||||
>=media-plugins/gst-plugins-alsa-0.10.14:0.10
|
||||
>=media-plugins/gst-plugins-oss-0.10.14:0.10 ) )
|
||||
networkmanager? ( >=net-misc/networkmanager-0.7.0 )
|
||||
policykit? ( >=sys-auth/polkit-0.92 )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=app-text/scrollkeeper-0.1.4
|
||||
>=app-text/gnome-doc-utils-0.3.2
|
||||
virtual/pkgconfig
|
||||
>=dev-util/intltool-0.35
|
||||
dev-libs/libxslt
|
||||
~app-text/docbook-xml-dtd-4.3
|
||||
gnome-base/gnome-common"
|
||||
# gnome-base/gnome-common for eautoreconf
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
G2CONF="${G2CONF}
|
||||
--without-hal
|
||||
--disable-battstat
|
||||
--disable-scrollkeeper
|
||||
--disable-schemas-install
|
||||
$(use_enable cpufreq)
|
||||
$(use_enable gstreamer mixer-applet)
|
||||
$(use_enable ipv6)
|
||||
$(use_enable networkmanager)
|
||||
$(use_enable policykit polkit)"
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-libnotify-0.7.patch \
|
||||
"${FILESDIR}"/${P}-underlinking.patch
|
||||
|
||||
# gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043
|
||||
epatch "${FILESDIR}"/${P}-dbus-fix.patch
|
||||
|
||||
# Invest applet tests need gconf/proxy/...
|
||||
sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
|
||||
invest-applet/invest/Makefile.in || die "disabling invest tests failed"
|
||||
|
||||
python_clean_py-compile_files
|
||||
python_convert_shebangs -r 2 .
|
||||
|
||||
eautoreconf
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
emake check || die "emake check failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
local APPLETS="accessx-status charpick drivemount geyes
|
||||
gkb-new gswitchit gweather invest-applet mini-commander
|
||||
mixer modemlights multiload null_applet stickynotes trashapplet"
|
||||
use cpufreq && APPLETS="${APPLETS} cpufreq"
|
||||
|
||||
# modemlights is out because it needs system-tools-backends-1
|
||||
|
||||
for applet in ${APPLETS} ; do
|
||||
docinto ${applet}
|
||||
|
||||
for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
|
||||
[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
|
||||
# check for new python modules on bumps
|
||||
python_mod_optimize invest
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_pkg_postrm
|
||||
python_mod_cleanup invest
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST gnome-dvb-daemon-0.2.5.tar.bz2 834203 RMD160 a0382bcb516271dd702081daa276cd0f6df400c5 SHA1 72b241774970a1e8fa70d9541459c3d997ab5a47 SHA256 049a5ed9e8d06479f83b49d29f60782350b6db9b3be32bb9eea60558ae796006
|
||||
DIST gnome-dvb-daemon-0.2.7.tar.xz 705700 RMD160 da67092e0018b861fcf42759ec95975114feed57 SHA1 ada97456b2f76f70599f247cb7da86e3e5fa8923 SHA256 788d6f1ddf67aad5187774836720f99ca33541cd201af513e6c111eb929e8ab1
|
||||
DIST gnome-dvb-daemon-0.2.8.tar.xz 693384 RMD160 4c751a8d4e726c93df990f18636b8243d7f9f0e3 SHA1 e36e730358104507609f3b88938b815e92d2cc65 SHA256 e82162da01e8d8ab4596d96ec5b83d592c319bfa63b33abed39e699f60e8f60d
|
||||
DIST gnome-dvb-daemon-0.2.9.tar.xz 680348 RMD160 b253d3b0bdd111dd67420c39af334936366c57f9 SHA1 78ca0b937431ec625b1a64b92755ab5eea0bae12 SHA256 53a94c87587ac1a3dea0733907d64423d1b426bb9218a27e3fcb493fc8b226a0
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.9.ebuild,v 1.1 2012/07/06 21:15:24 mattst88 Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
|
||||
inherit eutils python gnome2 multilib
|
||||
|
||||
DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
|
||||
HOMEPAGE="http://live.gnome.org/DVBDaemon"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="nls totem vala"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.32.0
|
||||
>=media-libs/gstreamer-0.10.29
|
||||
>=media-libs/gst-plugins-good-0.10.14
|
||||
>=media-libs/gst-plugins-bad-0.10.13
|
||||
>=dev-libs/libgee-0.5:0
|
||||
>=dev-db/sqlite-3.4
|
||||
>=media-libs/gst-rtsp-server-0.10.7
|
||||
media-plugins/gst-plugins-dvb
|
||||
dev-python/gst-python
|
||||
>=dev-python/pygobject-3.2.1:3
|
||||
>=dev-libs/gobject-introspection-0.10.8
|
||||
|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
|
||||
vala? ( >=dev-lang/vala-0.16:0.16 )
|
||||
totem? ( media-video/totem )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/perl-5.8.1
|
||||
>=dev-util/intltool-0.40.0
|
||||
virtual/pkgconfig
|
||||
nls? ( >=sys-devel/gettext-0.18.1 )
|
||||
>=sys-devel/libtool-2.2.6"
|
||||
|
||||
pkg_setup() {
|
||||
G2CONF="${G2CONF} \
|
||||
$(use_enable nls)
|
||||
$(use_enable totem totem-plugin)"
|
||||
use totem && G2CONF="${G2CONF} \
|
||||
--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
|
||||
# configure looks for 'valac', but we have 'valac-<version>'
|
||||
use vala && G2CONF="${G2CONF} \
|
||||
VALAC=${EPREFIX}/usr/bin/valac-0.16"
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Disable byte-compilation of Python modules.
|
||||
echo '#!/bin/sh' > py-compile
|
||||
gnome2_src_prepare
|
||||
python_convert_shebangs -r 2 .
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize gnomedvb
|
||||
if use totem; then
|
||||
python_mod_optimize "/usr/$(get_libdir)/totem/plugins"
|
||||
fi
|
||||
gnome2_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup gnomedvb
|
||||
if use totem; then
|
||||
python_mod_cleanup "/usr/$(get_libdir)/totem/plugins"
|
||||
fi
|
||||
gnome2_pkg_postrm
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST gnome-games-2.28.2.tar.bz2 25498433 RMD160 03c9ca6e899bcc44436b232b126f22a0946dff43 SHA1 c2be79044175df51e610edf4c9fd6fba270c02bf SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899
|
||||
DIST gnome-games-2.30.2.tar.bz2 27683256 RMD160 12c7e5ba3b4a9aca5d9918978e437e774ac0752b SHA1 3541ccc991af82603fc3067863bc27a731302b2c SHA256 57c3f3685cdd49016dfbf236f4a1d98c9d669d456fabe0aeb6f5a4128dba3586
|
||||
DIST gnome-games-3.2.1.tar.xz 22816376 RMD160 aac7a262bb0e115743213d7d03d0267dfaa45df9 SHA1 42670da7bfbdecc2014076263dfb30276446c826 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b
|
||||
DIST gnome-games-3.4.2.tar.xz 18578676 RMD160 0126bc920cbecaf5acd396aeef0c8ab2950cdbd8 SHA1 67824a59fd23548da27c9c34ed3572ef4c2f882a SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c
|
||||
DIST gnome-games-2.28.2.tar.bz2 25498433 SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899 SHA512 41d25c54d5d44d4a37ff87ca78fc236a7e33ef58c0eaadc0878eae3ff3bcabacfa986e8fc75230655b3a2bde70fdd81889213b97cbbc29c6b6768b47fb84d4bb WHIRLPOOL e4e958ae49d4b48278531b869bbaf3c085267b5fb6927a34681e7be6a350ce0f899f80c960e137d63aaee8ead1b70c1eb0d6814efacfaea5ff81332d44cb5cdc
|
||||
DIST gnome-games-3.2.1.tar.xz 22816376 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b SHA512 65cf96eee0f9c69279e0663ce6f72db3fe45d61bbba1a50b61f74bd9fd10c7c8053a55f0665930bfd219454bbbbe24c3388d62eee1e1beed783fe67558cc0ce0 WHIRLPOOL acabd4d12ff3ee3f052e949e67fd7be2e7878726fd230b690c1afb7126f0eaf78aae913b479beb364c00668cf0905295a07d8156b138df7d4c40df2fb2557b99
|
||||
DIST gnome-games-3.4.2.tar.xz 18578676 SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sat Jul 7 13:14:09 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
fix underlinking
|
||||
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -566,6 +566,9 @@
|
||||
|
||||
# Check for common modules
|
||||
|
||||
+PKG_CHECK_MODULES([X11],[x11])
|
||||
+AC_SUBST([X11_LIBS])
|
||||
+
|
||||
need_gthread=no
|
||||
PKG_CHECK_MODULES([GTHREAD],[gthread-2.0])
|
||||
AC_SUBST([GTHREAD_CFLAGS])
|
||||
--- gnect/src/Makefile.am
|
||||
+++ gnect/src/Makefile.am
|
||||
@@ -64,6 +64,7 @@
|
||||
|
||||
gnect_LDADD = \
|
||||
$(top_builddir)/libgames-support/libgames-support.la \
|
||||
+ $(X11_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(INTLLIBS) \
|
||||
$(LIB_GGZMOD) \
|
||||
--- iagno/Makefile.am
|
||||
+++ iagno/Makefile.am
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
iagno_LDADD = \
|
||||
$(top_builddir)/libgames-support/libgames-support.la \
|
||||
+ $(X11_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(INTLLIBS) \
|
||||
$(LIB_GGZMOD) \
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sat Jul 7 13:43:03 UTC 2012
|
||||
Subject:
|
||||
|
||||
--- gnibbles/Makefile.am
|
||||
+++ gnibbles/Makefile.am
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
gnibbles_LDADD = \
|
||||
$(top_builddir)/libgames-support/libgames-support.la \
|
||||
+ $(X11_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
@ -1,174 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild,v 1.16 2012/05/05 06:25:20 jdhore Exp $
|
||||
|
||||
EAPI="3"
|
||||
GCONF_DEBUG="no"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
# make sure games is inherited first so that the gnome2
|
||||
# functions will be called if they are not overridden
|
||||
inherit games games-ggz gnome2 python virtualx
|
||||
|
||||
DESCRIPTION="Collection of games for the GNOME desktop"
|
||||
HOMEPAGE="http://live.gnome.org/GnomeGames/"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.1"
|
||||
SLOT="0"
|
||||
|
||||
# 2.30.x versions are not ready to go to stable, please confirm before changing KEYWORDS
|
||||
KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
|
||||
IUSE="artworkextra +clutter guile opengl test"
|
||||
|
||||
# USE=clutter also enables introspection because gnome-games is the only known
|
||||
# consumer of introspection on libgames-support etc. If something else pops up,
|
||||
# we'll have to enable it unconditionally because we have no sane way of
|
||||
# representing inter-use-flag dependencies
|
||||
COMMON_DEPEND="
|
||||
>=dev-games/libggz-0.0.14
|
||||
>=dev-games/ggz-client-libs-0.0.14
|
||||
>=dev-libs/dbus-glib-0.75
|
||||
>=dev-libs/glib-2.6.3:2
|
||||
>=dev-libs/libxml2-2.4.0:2
|
||||
>=dev-python/gconf-python-2.17.3
|
||||
>=dev-python/pygobject-2:2
|
||||
>=dev-python/pygtk-2.14:2
|
||||
>=dev-python/pycairo-1
|
||||
>=gnome-base/gconf-2:2
|
||||
>=gnome-base/librsvg-2.14:2
|
||||
media-libs/libcanberra[gtk]
|
||||
>=x11-libs/cairo-1
|
||||
>=x11-libs/gtk+-2.16:2
|
||||
x11-libs/libSM
|
||||
|
||||
artworkextra? ( gnome-extra/gnome-games-extra-data )
|
||||
clutter? (
|
||||
>=dev-libs/gobject-introspection-0.6.3
|
||||
>=media-libs/clutter-1.0.0:1.0
|
||||
>=media-libs/clutter-gtk-0.10.2:0.10 )
|
||||
guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
|
||||
opengl? (
|
||||
dev-python/pygtkglext
|
||||
>=dev-python/pyopengl-3 )
|
||||
!games-board/glchess"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
clutter? (
|
||||
dev-libs/seed
|
||||
x11-libs/gtk+:2[introspection]
|
||||
>=media-libs/clutter-1.0.0:1.0[introspection]
|
||||
>=media-libs/clutter-gtk-0.10.2:0.10[introspection] )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/autoconf-2.53
|
||||
virtual/pkgconfig
|
||||
>=dev-util/intltool-0.40.4
|
||||
>=sys-devel/gettext-0.10.40
|
||||
>=gnome-base/gnome-common-2.12.0
|
||||
>=app-text/scrollkeeper-0.3.8
|
||||
>=app-text/gnome-doc-utils-0.10
|
||||
test? ( >=dev-libs/check-0.9.4 )"
|
||||
|
||||
# Others are installed below; multiples in this package.
|
||||
DOCS="AUTHORS HACKING MAINTAINERS TODO"
|
||||
|
||||
# dang make-check fails on docs with -j > 1. Restrict them for the moment until
|
||||
# it can be chased down.
|
||||
RESTRICT="test"
|
||||
|
||||
_omitgame() {
|
||||
G2CONF="${G2CONF},${1}"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
# create the games user / group
|
||||
games_pkg_setup
|
||||
|
||||
G2CONF="${G2CONF}
|
||||
$(use_enable clutter introspection)
|
||||
--disable-aisleriot-clutter
|
||||
--disable-card-themes-installer
|
||||
--enable-sound
|
||||
--with-scores-group=${GAMES_GROUP}
|
||||
--with-platform=gnome
|
||||
--with-card-theme-formats=all
|
||||
--with-smclient
|
||||
--enable-omitgames=none" # This line should be last for _omitgame
|
||||
|
||||
if ! use clutter; then
|
||||
ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
|
||||
_omitgame quadrapassel
|
||||
_omitgame lightsoff
|
||||
_omitgame swell-foop
|
||||
_omitgame gnibbles
|
||||
fi
|
||||
|
||||
if ! use guile; then
|
||||
ewarn "USE=-guile implies that Aisleriot won't be installed"
|
||||
_omitgame aisleriot
|
||||
fi
|
||||
|
||||
if ! use opengl; then
|
||||
ewarn "USE=-opengl implies that glchess won't be installed"
|
||||
_omitgame glchess
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
|
||||
# disable pyc compiling
|
||||
echo > py-compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# Documentation install for each of the games
|
||||
for game in \
|
||||
$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
|
||||
docinto ${game}
|
||||
for doc in AUTHORS ChangeLog NEWS README TODO; do
|
||||
[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
# Avoid overwriting previous .scores files
|
||||
local basefile
|
||||
for scorefile in "${D}"/var/lib/games/*.scores; do
|
||||
basefile=$(basename $scorefile)
|
||||
if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
|
||||
cp "${ROOT}/var/lib/games/${basefile}" \
|
||||
"${D}/var/lib/games/${basefile}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
games-ggz_update_modules
|
||||
gnome2_pkg_postinst
|
||||
python_need_rebuild
|
||||
python_mod_optimize gnome_sudoku
|
||||
if use opengl; then
|
||||
python_mod_optimize glchess
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
games-ggz_update_modules
|
||||
gnome2_pkg_postrm
|
||||
python_mod_cleanup gnome_sudoku
|
||||
if use opengl; then
|
||||
python_mod_cleanup glchess
|
||||
fi
|
||||
}
|
||||
@ -1,176 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild,v 1.3 2012/05/05 06:25:20 jdhore Exp $
|
||||
|
||||
EAPI="3"
|
||||
GCONF_DEBUG="no"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
# make sure games is inherited first so that the gnome2
|
||||
# functions will be called if they are not overridden
|
||||
inherit games games-ggz gnome2 python virtualx
|
||||
|
||||
DESCRIPTION="Collection of games for the GNOME desktop"
|
||||
HOMEPAGE="http://live.gnome.org/GnomeGames/"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.1"
|
||||
SLOT="0"
|
||||
|
||||
# 2.30.x versions are not ready to go to stable, please confirm before changing KEYWORDS
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="artworkextra +clutter guile opengl test"
|
||||
|
||||
# USE=clutter also enables introspection because gnome-games is the only known
|
||||
# consumer of introspection on libgames-support etc. If something else pops up,
|
||||
# we'll have to enable it unconditionally because we have no sane way of
|
||||
# representing inter-use-flag dependencies
|
||||
COMMON_DEPEND="
|
||||
>=dev-games/libggz-0.0.14
|
||||
>=dev-games/ggz-client-libs-0.0.14
|
||||
>=dev-libs/dbus-glib-0.75
|
||||
>=dev-libs/glib-2.6.3:2
|
||||
>=dev-libs/libxml2-2.4.0:2
|
||||
>=dev-python/gconf-python-2.17.3
|
||||
>=dev-python/pygobject-2:2
|
||||
>=dev-python/pygtk-2.14:2
|
||||
>=dev-python/pycairo-1
|
||||
>=gnome-base/gconf-2:2
|
||||
>=gnome-base/librsvg-2.14:2
|
||||
media-libs/libcanberra[gtk]
|
||||
>=x11-libs/cairo-1
|
||||
>=x11-libs/gtk+-2.16:2
|
||||
x11-libs/libSM
|
||||
|
||||
artworkextra? ( gnome-extra/gnome-games-extra-data )
|
||||
clutter? (
|
||||
>=dev-libs/gobject-introspection-0.6.3
|
||||
>=media-libs/clutter-1.0.0:1.0
|
||||
>=media-libs/clutter-gtk-0.10.2:0.10 )
|
||||
guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
|
||||
opengl? (
|
||||
dev-python/pygtkglext
|
||||
>=dev-python/pyopengl-3 )
|
||||
!games-board/glchess"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
clutter? (
|
||||
dev-libs/seed
|
||||
x11-libs/gtk+:2[introspection]
|
||||
>=media-libs/clutter-1.0.0:1.0[introspection]
|
||||
>=media-libs/clutter-gtk-0.10.2:0.10[introspection] )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/autoconf-2.53
|
||||
virtual/pkgconfig
|
||||
>=dev-util/intltool-0.40.4
|
||||
>=sys-devel/gettext-0.10.40
|
||||
>=gnome-base/gnome-common-2.12.0
|
||||
>=app-text/scrollkeeper-0.3.8
|
||||
>=app-text/gnome-doc-utils-0.10
|
||||
test? ( >=dev-libs/check-0.9.4 )"
|
||||
|
||||
# Others are installed below; multiples in this package.
|
||||
DOCS="AUTHORS HACKING MAINTAINERS TODO"
|
||||
|
||||
# dang make-check fails on docs with -j > 1. Restrict them for the moment until
|
||||
# it can be chased down.
|
||||
RESTRICT="test"
|
||||
|
||||
_omitgame() {
|
||||
G2CONF="${G2CONF},${1}"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
# create the games user / group
|
||||
games_pkg_setup
|
||||
|
||||
G2CONF="${G2CONF}
|
||||
$(use_enable clutter introspection)
|
||||
--disable-aisleriot-clutter
|
||||
--disable-card-themes-installer
|
||||
--enable-sound
|
||||
--with-scores-group=${GAMES_GROUP}
|
||||
--with-platform=gnome
|
||||
--with-card-theme-formats=all
|
||||
--with-smclient
|
||||
--enable-omitgames=none" # This line should be last for _omitgame
|
||||
|
||||
if ! use clutter; then
|
||||
ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
|
||||
_omitgame quadrapassel
|
||||
_omitgame lightsoff
|
||||
_omitgame swell-foop
|
||||
_omitgame gnibbles
|
||||
fi
|
||||
|
||||
if ! use guile; then
|
||||
ewarn "USE=-guile implies that Aisleriot won't be installed"
|
||||
_omitgame aisleriot
|
||||
fi
|
||||
|
||||
if ! use opengl; then
|
||||
ewarn "USE=-opengl implies that glchess won't be installed"
|
||||
_omitgame glchess
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
|
||||
python_convert_shebangs -r 2 gnome-sudoku/src
|
||||
|
||||
# disable pyc compiling
|
||||
echo > py-compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# Documentation install for each of the games
|
||||
for game in \
|
||||
$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
|
||||
docinto ${game}
|
||||
for doc in AUTHORS ChangeLog NEWS README TODO; do
|
||||
[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
# Avoid overwriting previous .scores files
|
||||
local basefile
|
||||
for scorefile in "${D}"/var/lib/games/*.scores; do
|
||||
basefile=$(basename $scorefile)
|
||||
if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
|
||||
cp "${ROOT}/var/lib/games/${basefile}" \
|
||||
"${D}/var/lib/games/${basefile}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
games-ggz_update_modules
|
||||
gnome2_pkg_postinst
|
||||
python_need_rebuild
|
||||
python_mod_optimize gnome_sudoku
|
||||
if use opengl; then
|
||||
python_mod_optimize glchess
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
games-ggz_update_modules
|
||||
gnome2_pkg_postrm
|
||||
python_mod_cleanup gnome_sudoku
|
||||
if use opengl; then
|
||||
python_mod_cleanup glchess
|
||||
fi
|
||||
}
|
||||
@ -1,190 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild,v 1.5 2012/05/05 06:25:20 jdhore Exp $
|
||||
|
||||
EAPI="3"
|
||||
GNOME_TARBALL_SUFFIX="xz"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
PYTHON_USE_WITH="xml"
|
||||
|
||||
# make sure games is inherited first so that the gnome2
|
||||
# functions will be called if they are not overridden
|
||||
inherit autotools games eutils gnome2 python virtualx
|
||||
|
||||
DESCRIPTION="Collection of games for the GNOME desktop"
|
||||
HOMEPAGE="http://live.gnome.org/GnomeGames/"
|
||||
|
||||
LICENSE="GPL-2 GPL-3 FDL-1.1"
|
||||
SLOT="0"
|
||||
# TODO: file KEYWORDREQ bug once it's determined that seed is usable
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="artworkextra +aisleriot +clutter +introspection glchess seed +sudoku test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/dbus-glib-0.75
|
||||
>=dev-libs/glib-2.25.7
|
||||
>=dev-libs/libxml2-2.4.0
|
||||
>=gnome-base/gconf-2.31.1
|
||||
>=gnome-base/librsvg-2.32
|
||||
>=x11-libs/cairo-1
|
||||
>=x11-libs/gtk+-2.91.7:3[introspection?]
|
||||
|
||||
media-libs/libcanberra[gtk3]
|
||||
x11-libs/libSM
|
||||
|
||||
artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
|
||||
clutter? (
|
||||
>=dev-libs/gobject-introspection-0.6.3
|
||||
>=x11-libs/gtk+-2.90:3[introspection]
|
||||
>=gnome-base/gconf-2.31.1[introspection]
|
||||
>=media-libs/clutter-gtk-0.91.6:1.0[introspection]
|
||||
seed? ( >=dev-libs/seed-2.91.90 ) )
|
||||
introspection? (
|
||||
>=dev-libs/gobject-introspection-0.6.3
|
||||
media-libs/clutter:1.0[introspection] )
|
||||
glchess? (
|
||||
dev-db/sqlite:3
|
||||
>=gnome-base/librsvg-2.32
|
||||
virtual/opengl
|
||||
x11-libs/libX11 )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
sudoku? (
|
||||
|| (
|
||||
dev-python/pygobject:3[cairo]
|
||||
>=dev-python/pygobject-2.28.3:2[cairo,introspection] )
|
||||
dev-python/pycairo
|
||||
x11-libs/gdk-pixbuf:2[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
>=x11-libs/gtk+-3.0.0:3[introspection] )
|
||||
|
||||
!<gnome-extra/gnome-games-extra-data-3.0.0"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
glchess? ( >=dev-lang/vala-0.13.0:0.14 )
|
||||
virtual/pkgconfig
|
||||
>=dev-util/intltool-0.40.4
|
||||
>=sys-devel/gettext-0.10.40
|
||||
>=gnome-base/gnome-common-2.12.0
|
||||
>=app-text/scrollkeeper-0.3.8
|
||||
>=app-text/gnome-doc-utils-0.10
|
||||
test? ( >=dev-libs/check-0.9.4 )"
|
||||
|
||||
# For compatibility with older versions of the gnome-games package
|
||||
PDEPEND="aisleriot? ( games-board/aisleriot )"
|
||||
|
||||
# Others are installed below; multiples in this package.
|
||||
DOCS="AUTHORS HACKING MAINTAINERS TODO"
|
||||
|
||||
_omitgame() {
|
||||
G2CONF="${G2CONF},${1}"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# create the games user / group
|
||||
games_pkg_setup
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
G2CONF="${G2CONF}
|
||||
--disable-schemas-compile
|
||||
--enable-sound
|
||||
$(use_enable introspection)"
|
||||
|
||||
# Should be after $(use_enable introspection), but before --enable-omitgames
|
||||
use clutter && G2CONF="${G2CONF} --enable-introspection"
|
||||
|
||||
use glchess && G2CONF="${G2CONF} VALAC=$(type -p valac-0.14)"
|
||||
|
||||
# Staging games are needed for swell-foop and lightsoff
|
||||
G2CONF="${G2CONF}
|
||||
--enable-staging
|
||||
--with-scores-group=${GAMES_GROUP}
|
||||
--with-platform=gnome
|
||||
--with-smclient
|
||||
--with-gtk=3.0
|
||||
--enable-omitgames=none" # This line should be last for _omitgame
|
||||
|
||||
# FIXME: Use REQUIRED_USE once games.eclass is ported to EAPI 4
|
||||
if ! use clutter; then
|
||||
ewarn "USE='-clutter' => quadrapassel, swell-foop, lightsoff, gnibbles won't be installed"
|
||||
_omitgame quadrapassel
|
||||
_omitgame gnibbles
|
||||
_omitgame swell-foop
|
||||
_omitgame lightsoff
|
||||
use seed && ewarn "USE='seed' has no effect with USE='-clutter'"
|
||||
elif ! use seed; then
|
||||
ewarn "USE='-seed' => swell-foop, lightsoff won't be installed"
|
||||
_omitgame swell-foop
|
||||
_omitgame lightsoff
|
||||
fi
|
||||
|
||||
if ! use glchess; then
|
||||
_omitgame glchess
|
||||
fi
|
||||
|
||||
if ! use sudoku; then
|
||||
_omitgame gnome-sudoku
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src
|
||||
|
||||
# TODO: File upstream bug for this
|
||||
epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
|
||||
|
||||
# Without this, --enable-staging enables all those games unconditionally
|
||||
epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
|
||||
|
||||
eautoreconf
|
||||
|
||||
# disable pyc compiling
|
||||
echo > py-compile
|
||||
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# Documentation install for each of the games
|
||||
for game in \
|
||||
$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
|
||||
docinto ${game}
|
||||
for doc in AUTHORS ChangeLog NEWS README TODO; do
|
||||
[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
# Avoid overwriting previous .scores files
|
||||
local basefile
|
||||
for scorefile in "${ED}"/var/lib/games/*.scores; do
|
||||
basefile=$(basename $scorefile)
|
||||
if [ -s "${EROOT}/var/lib/games/${basefile}" ]; then
|
||||
cp "${EROOT}/var/lib/games/${basefile}" \
|
||||
"${ED}/var/lib/games/${basefile}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_pkg_postinst
|
||||
python_need_rebuild
|
||||
use sudoku && python_mod_optimize gnome_sudoku
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_pkg_postrm
|
||||
python_mod_cleanup gnome_sudoku
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST marble-4.7.4.tar.bz2 21068089 RMD160 f0eec0300ca87dbb50b94563c86fbb56eb72cfd7 SHA1 e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab SHA256 e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
|
||||
DIST marble-4.8.3.tar.xz 19899712 RMD160 41312f2afb275206a506766e446db973ddee11b1 SHA1 d33d73d757b14a42640176b994ad5930ebc1df30 SHA256 1aae47e3c5365fc922d0c0e50aded329930f43be43c19d35345c8c20c8aff9a8
|
||||
DIST marble-4.8.4.tar.xz 19899160 RMD160 a8c6a095ad8ff014156a24968259502b4853492c SHA1 ec3cd41a1d333e9e3b34595adf6e4859315159b9 SHA256 3e5e7db5b69b3cdebcb0b76bded572a6e824b5a770f16b5b9f7f193f1e0df026
|
||||
DIST marble-4.7.4.tar.bz2 21068089 SHA256 e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
|
||||
DIST marble-4.8.3.tar.xz 19899712 SHA256 1aae47e3c5365fc922d0c0e50aded329930f43be43c19d35345c8c20c8aff9a8
|
||||
DIST marble-4.8.4.tar.xz 19899160 SHA256 3e5e7db5b69b3cdebcb0b76bded572a6e824b5a770f16b5b9f7f193f1e0df026 SHA512 63d32e3b226a2004d78873bfb92cc3b1b66d0dc9d815070dbadf928a46a48a97e1b31a8fe30857de1cc5c8203834c1515c459fcfdb7cd762a47295baa6781e32 WHIRLPOOL 2f5a5707a39474266d9ba8b92f579a29c0106f6d4bb4159bcdb2ec813652ec8f73ed5d826f4bb2488dff1935e46d7fc5ab2207db62d53720a72e85a3bf0d5bb3
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST libjpeg-turbo-1.2.0.tar.gz 1752925 SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e SHA512 cdfebd83f95988ebf79451363acb46f57555eafe8d782ef1ab7ace2d2336698f804f9ce33de850cc5bc453e91cb24878a7a40143f2ffd39d6def3d28f6ff65bb WHIRLPOOL 3f3614f42ab3b8c45ab947bda09635015bcc4b562a4d16a272d86fccb50d5c47a8ad0170f1c03b793f275e6a9eac64ff30a9b5e473d00158ccc33654f1511cce
|
||||
DIST libjpeg-turbo-1.2.1.tar.gz 1755264 SHA256 cb3323f054a02cedad193bd0ca418d46934447f995d19e678ea64f78e4903770 SHA512 1ea3d2cfcc24ebe83b669417b86c59563781e74ef5358bf44fc380d4379bd200965aed7390cbfd269cac9f6abd21b3bcb156cb7f3deb5d0e9bfe0a07347d45f6 WHIRLPOOL 70e19e40c218e6ed9583ea5903a130db2fb18491c1c08da8a8989d6fcdf19bf846737ea1660d45107c03ee0a2b7406cefd5ee22533a839c49c2526acc4578d10
|
||||
DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
|
||||
|
||||
@ -0,0 +1,118 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild,v 1.1 2012/07/07 07:11:15 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
JPEG_ABI=8
|
||||
|
||||
if [[ ${PV} == *_p20* ]]; then
|
||||
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||
inherit autotools
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
fi
|
||||
|
||||
inherit eutils java-pkg-opt-2 libtool toolchain-funcs
|
||||
|
||||
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
|
||||
HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
|
||||
SRC_URI="${SRC_URI}
|
||||
mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="java static-libs"
|
||||
|
||||
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
|
||||
COMMON_DEPEND="!media-libs/jpeg:0"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
java? ( >=virtual/jre-1.5 )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
amd64? ( ${ASM_DEPEND} )
|
||||
x86? ( ${ASM_DEPEND} )
|
||||
amd64-fbsd? ( ${ASM_DEPEND} )
|
||||
x86-fbsd? ( ${ASM_DEPEND} )
|
||||
amd64-linux? ( ${ASM_DEPEND} )
|
||||
x86-linux? ( ${ASM_DEPEND} )
|
||||
x64-macos? ( ${ASM_DEPEND} )
|
||||
java? ( >=virtual/jdk-1.5 )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
|
||||
|
||||
if [[ -x ./configure ]]; then
|
||||
elibtoolize
|
||||
else
|
||||
eautoreconf
|
||||
fi
|
||||
|
||||
epunt_cxx #424689
|
||||
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use java; then
|
||||
export JAVACFLAGS="$(java-pkg_javac-args)"
|
||||
export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
|
||||
fi
|
||||
local myconf=()
|
||||
[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
|
||||
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--with-jpeg${JPEG_ABI} \
|
||||
$(use_with java) \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local _java_makeopts
|
||||
use java && _java_makeopts="-j1"
|
||||
emake ${_java_makeopts}
|
||||
|
||||
ebegin "Building exifautotran and jpegexiforient extra tools"
|
||||
pushd ../debian/extra >/dev/null
|
||||
emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
|
||||
popd >/dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
docdir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
exampledir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
install
|
||||
|
||||
prune_libtool_files
|
||||
|
||||
insinto /usr/share/doc/${PF}/html
|
||||
doins -r doc/html/*
|
||||
|
||||
if use java; then
|
||||
insinto /usr/share/doc/${PF}/html/java
|
||||
doins -r java/doc/*
|
||||
newdoc java/README README.java
|
||||
|
||||
rm -rf "${ED}"usr/classes
|
||||
java-pkg_dojar java/turbojpeg.jar
|
||||
fi
|
||||
|
||||
ebegin "Installing exifautotran and jpegexiforient extra tools"
|
||||
pushd ../debian/extra >/dev/null
|
||||
newdoc ../changelog changelog.debian
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" prefix="${EPREFIX}"/usr \
|
||||
INSTALL="install -m755" INSTALLDIR="install -d -m755" \
|
||||
install
|
||||
popd >/dev/null
|
||||
eend $?
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST clementine-0.7.1.tar.gz 5967162 SHA256 246e56f9283384b354bd43d5ec9937ceb93889f680f7bf45bd1ab00db36d61bc SHA512 199271da318a4139149ca24f97110a7b7da7790e9b2ae4b5e132a67c5cc5d220b95fc35deef07d442fd4c99449cfc3c27a723f5aa276b7fbf97b31ad7f8cc783 WHIRLPOOL b9e1a8e88c526d0f493e25f12e2163ccd5c69c2ee406366a4d56f5e9c654515e0ad1a813b9df94c50a6e666cf1a1fd2d7d575f315dabc7351339208b2f55c640
|
||||
DIST clementine-1.0.1.tar.gz 8267876 SHA256 bf28c6584e280f58e8ebf7ba33cee1f926c0b8f1857ae605164ecbb2ff096e7d SHA512 7657d8f906a349f2085a5bda410c1af093626b4839424136dcb277bb775dad1cb91dce6138035d0c9f83a8a1079a58c01a7f7fd3bd63f7e2fbd5c8bff387437c WHIRLPOOL eebeb245d12ad871b0e2fbc1b4bd33c5ce31ff03f98536bcd9197084cd7dd5c7dfce1cb9169b585a60901845351ae8626ca689d80b15fa0dddaca68e4c9f6556
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
From e57ed6f3b70e589bf113a26bc58cc7896d0d56b7 Mon Sep 17 00:00:00 2001
|
||||
From: David Sansome <me@davidsansome.com>
|
||||
Date: Mon, 11 Apr 2011 22:06:44 +0000
|
||||
Subject: Fix DeviceKit devices on Linux. Thanks vsevolod.minkov. Fixes issue 1217
|
||||
|
||||
git-svn-id: http://clementine-player.googlecode.com/svn/trunk@3123 94c5599e-fc6c-11de-b061-8119ef04aefe
|
||||
---
|
||||
diff --git a/src/config.h.in b/src/config.h.in
|
||||
index d89395f..c7c765f 100644
|
||||
--- a/src/config.h.in
|
||||
+++ b/src/config.h.in
|
||||
@@ -22,6 +22,7 @@
|
||||
#cmakedefine ENABLE_VISUALISATIONS
|
||||
#cmakedefine HAVE_BREAKPAD
|
||||
#cmakedefine HAVE_DBUS
|
||||
+#cmakedefine HAVE_DEVICEKIT
|
||||
#cmakedefine HAVE_GIO
|
||||
#cmakedefine HAVE_IMOBILEDEVICE
|
||||
#cmakedefine HAVE_LIBARCHIVE
|
||||
--
|
||||
cgit v0.9
|
||||
@ -0,0 +1,475 @@
|
||||
--- src/core/song.cpp
|
||||
+++ src/core/song.cpp
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
#include "internet/fixlastfm.h"
|
||||
- #include <lastfm/Track>
|
||||
+ #include <lastfm/Track.h>
|
||||
#endif
|
||||
|
||||
#include <QFile>
|
||||
--- src/covers/lastfmcoverprovider.cpp
|
||||
+++ src/covers/lastfmcoverprovider.cpp
|
||||
@@ -19,8 +19,8 @@
|
||||
#include "coverprovider.h"
|
||||
#include "lastfmcoverprovider.h"
|
||||
|
||||
-#include <lastfm/Artist>
|
||||
-#include <lastfm/XmlQuery>
|
||||
+#include <lastfm/Artist.h>
|
||||
+#include <lastfm/XmlQuery.h>
|
||||
#include <lastfm/ws.h>
|
||||
|
||||
#include <QNetworkReply>
|
||||
@@ -52,14 +52,8 @@ void LastFmCoverProvider::QueryFinished(
|
||||
|
||||
CoverSearchResults results;
|
||||
|
||||
- try {
|
||||
- lastfm::XmlQuery query(lastfm::ws::parse(reply));
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError) {
|
||||
- throw std::runtime_error("");
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
+ lastfm::XmlQuery query;
|
||||
+ if (query.parse(reply->readAll())) {
|
||||
// parse the list of search results
|
||||
QList<lastfm::XmlQuery> elements = query["results"]["albummatches"].children("album");
|
||||
|
||||
@@ -69,7 +63,7 @@ void LastFmCoverProvider::QueryFinished(
|
||||
result.image_url = element["image size=extralarge"].text();
|
||||
results << result;
|
||||
}
|
||||
- } catch(std::runtime_error&) {
|
||||
+ } else {
|
||||
// Drop through and emit an empty list of results.
|
||||
}
|
||||
|
||||
--- src/internet/lastfmservice.cpp
|
||||
+++ src/internet/lastfmservice.cpp
|
||||
@@ -33,20 +33,18 @@
|
||||
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
|
||||
-#include <lastfm/Audioscrobbler>
|
||||
+#include <lastfm/Audioscrobbler.h>
|
||||
#include <lastfm/misc.h>
|
||||
-#include <lastfm/RadioStation>
|
||||
-#include <lastfm/Scrobble>
|
||||
-#include <lastfm/ScrobbleCache>
|
||||
-#include <lastfm/ScrobblePoint>
|
||||
+#include <lastfm/RadioStation.h>
|
||||
+#include <lastfm/ScrobbleCache.h>
|
||||
+#include <lastfm/ScrobblePoint.h>
|
||||
#include <lastfm/ws.h>
|
||||
-#include <lastfm/XmlQuery>
|
||||
+#include <lastfm/XmlQuery.h>
|
||||
|
||||
#include <QMenu>
|
||||
#include <QSettings>
|
||||
|
||||
using boost::scoped_ptr;
|
||||
-using lastfm::Scrobble;
|
||||
using lastfm::XmlQuery;
|
||||
|
||||
uint qHash(const lastfm::Track& track) {
|
||||
@@ -300,13 +298,8 @@ void LastFMService::AuthenticateReplyFin
|
||||
reply->deleteLater();
|
||||
|
||||
// Parse the reply
|
||||
- try {
|
||||
- lastfm::XmlQuery const lfm = lastfm::ws::parse(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
-
|
||||
+ lastfm::XmlQuery lfm;
|
||||
+ if (lfm.parse(reply->readAll())) {
|
||||
lastfm::ws::Username = lfm["session"]["name"].text();
|
||||
lastfm::ws::SessionKey = lfm["session"]["key"].text();
|
||||
QString subscribed = lfm["session"]["subscriber"].text();
|
||||
@@ -318,8 +311,8 @@ void LastFMService::AuthenticateReplyFin
|
||||
settings.setValue("Username", lastfm::ws::Username);
|
||||
settings.setValue("Session", lastfm::ws::SessionKey);
|
||||
settings.setValue("Subscriber", is_subscriber);
|
||||
- } catch (std::runtime_error& e) {
|
||||
- qLog(Error) << e.what();
|
||||
+ } else {
|
||||
+ qLog(Error) << lfm.parseError().message();
|
||||
emit AuthenticationComplete(false);
|
||||
return;
|
||||
}
|
||||
@@ -347,13 +340,8 @@ void LastFMService::UpdateSubscriberStat
|
||||
|
||||
bool is_subscriber = false;
|
||||
|
||||
- try {
|
||||
- const lastfm::XmlQuery lfm = lastfm::ws::parse(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
-
|
||||
+ lastfm::XmlQuery lfm;
|
||||
+ if (lfm.parse(reply->readAll())) {
|
||||
connection_problems_ = false;
|
||||
QString subscriber = lfm["user"]["subscriber"].text();
|
||||
is_subscriber = (subscriber.toInt() == 1);
|
||||
@@ -362,11 +350,9 @@ void LastFMService::UpdateSubscriberStat
|
||||
settings.beginGroup(kSettingsGroup);
|
||||
settings.setValue("Subscriber", is_subscriber);
|
||||
qLog(Info) << lastfm::ws::Username << "Subscriber status:" << is_subscriber;
|
||||
- } catch (lastfm::ws::ParseError e) {
|
||||
- qLog(Error) << "Last.fm parse error: " << e.enumValue();
|
||||
- connection_problems_ = e.enumValue() == lastfm::ws::MalformedResponse;
|
||||
- } catch (std::runtime_error& e) {
|
||||
- qLog(Error) << e.what();
|
||||
+ } else {
|
||||
+ qLog(Error) << "Last.fm parse error: " << lfm.parseError().message();
|
||||
+ connection_problems_ = lfm.parseError().enumValue() == lastfm::ws::MalformedResponse;
|
||||
}
|
||||
|
||||
emit UpdatedSubscriberStatus(is_subscriber);
|
||||
@@ -469,7 +455,8 @@ bool LastFMService::InitScrobbler() {
|
||||
scrobbler_ = new lastfm::Audioscrobbler(kAudioscrobblerClientId);
|
||||
|
||||
//reemit the signal since the sender is private
|
||||
- connect(scrobbler_, SIGNAL(status(int)), SIGNAL(ScrobblerStatus(int)));
|
||||
+ connect(scrobbler_, SIGNAL(scrobblesSubmitted(QList<lastfm::Track>)), SIGNAL(ScrobbleSubmitted()));
|
||||
+ connect(scrobbler_, SIGNAL(nowPlayingError(int,QString)), SIGNAL(ScrobbleError(int)));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -497,7 +484,7 @@ void LastFMService::NowPlaying(const Son
|
||||
if (!last_track_.isNull() &&
|
||||
last_track_.source() == lastfm::Track::NonPersonalisedBroadcast) {
|
||||
const int duration_secs = last_track_.timestamp().secsTo(QDateTime::currentDateTime());
|
||||
- if (duration_secs >= ScrobblePoint::kScrobbleMinLength) {
|
||||
+ if (duration_secs >= lastfm::ScrobblePoint::scrobbleTimeMin()) {
|
||||
lastfm::MutableTrack mtrack(last_track_);
|
||||
mtrack.setDuration(duration_secs);
|
||||
|
||||
@@ -514,14 +501,16 @@ void LastFMService::NowPlaying(const Son
|
||||
already_scrobbled_ = false;
|
||||
last_track_ = mtrack;
|
||||
|
||||
- //check immediately if the song is valid
|
||||
- Scrobble::Invalidity invalidity;
|
||||
-
|
||||
- if (!lastfm::Scrobble(last_track_).isValid( &invalidity )) {
|
||||
- //for now just notify this, we can also see the cause
|
||||
- emit ScrobblerStatus(-1);
|
||||
- return;
|
||||
- }
|
||||
+// TODO: validity was removed from liblastfm1 but might reappear, it should have
|
||||
+// no impact as we get a different error when actually trying to scrobble.
|
||||
+// //check immediately if the song is valid
|
||||
+// Scrobble::Invalidity invalidity;
|
||||
+//
|
||||
+// if (!lastfm::Scrobble(last_track_).isValid( &invalidity )) {
|
||||
+// //for now just notify this, we can also see the cause
|
||||
+// emit ScrobbleError(-1);
|
||||
+// return;
|
||||
+// }
|
||||
|
||||
scrobbler_->nowPlaying(mtrack);
|
||||
}
|
||||
@@ -530,12 +519,12 @@ void LastFMService::Scrobble() {
|
||||
if (!InitScrobbler())
|
||||
return;
|
||||
|
||||
- ScrobbleCache cache(lastfm::ws::Username);
|
||||
+ lastfm::ScrobbleCache cache(lastfm::ws::Username);
|
||||
qLog(Debug) << "There are" << cache.tracks().count() << "tracks in the last.fm cache.";
|
||||
scrobbler_->cache(last_track_);
|
||||
|
||||
// Let's mark a track as cached, useful when the connection is down
|
||||
- emit ScrobblerStatus(30);
|
||||
+ emit ScrobbleError(30);
|
||||
scrobbler_->submit();
|
||||
|
||||
already_scrobbled_ = true;
|
||||
@@ -640,7 +629,7 @@ void LastFMService::RefreshFriends(bool
|
||||
return;
|
||||
}
|
||||
|
||||
- lastfm::AuthenticatedUser user;
|
||||
+ lastfm::User user;
|
||||
QNetworkReply* reply = user.getFriends();
|
||||
connect(reply, SIGNAL(finished()), SLOT(RefreshFriendsFinished()));
|
||||
}
|
||||
@@ -649,7 +638,7 @@ void LastFMService::RefreshNeighbours()
|
||||
if (!neighbours_list_ || !IsAuthenticated())
|
||||
return;
|
||||
|
||||
- lastfm::AuthenticatedUser user;
|
||||
+ lastfm::User user;
|
||||
QNetworkReply* reply = user.getNeighbours();
|
||||
connect(reply, SIGNAL(finished()), SLOT(RefreshNeighboursFinished()));
|
||||
}
|
||||
@@ -661,14 +650,11 @@ void LastFMService::RefreshFriendsFinish
|
||||
|
||||
QList<lastfm::User> friends;
|
||||
|
||||
- try {
|
||||
- friends = lastfm::User::list(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
- } catch (std::runtime_error& e) {
|
||||
- qLog(Error) << e.what();
|
||||
+ lastfm::XmlQuery lfm;
|
||||
+ if (lfm.parse(reply->readAll())) {
|
||||
+ friends = lastfm::UserList(lfm).users();
|
||||
+ } else {
|
||||
+ qLog(Error) << lfm.parseError().message();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -708,14 +694,11 @@ void LastFMService::RefreshNeighboursFin
|
||||
|
||||
QList<lastfm::User> neighbours;
|
||||
|
||||
- try {
|
||||
- neighbours = lastfm::User::list(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
- } catch (std::runtime_error& e) {
|
||||
- qLog(Error) << e.what();
|
||||
+ lastfm::XmlQuery lfm;
|
||||
+ if (lfm.parse(reply->readAll())) {
|
||||
+ neighbours = lastfm::UserList(lfm).users();
|
||||
+ } else {
|
||||
+ qLog(Error) << lfm.parseError().message();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -869,13 +852,8 @@ void LastFMService::FetchMoreTracksFinis
|
||||
model()->task_manager()->SetTaskFinished(tune_task_id_);
|
||||
tune_task_id_ = 0;
|
||||
|
||||
- try {
|
||||
- const XmlQuery& query = lastfm::ws::parse(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
-
|
||||
+ XmlQuery query;
|
||||
+ if (query.parse(reply->readAll())) {
|
||||
const XmlQuery& playlist = query["playlist"];
|
||||
foreach (const XmlQuery& q, playlist["trackList"].children("track")) {
|
||||
lastfm::MutableTrack t;
|
||||
@@ -890,17 +868,9 @@ void LastFMService::FetchMoreTracksFinis
|
||||
art_urls_[t] = q["image"].text();
|
||||
playlist_ << t;
|
||||
}
|
||||
- } catch (std::runtime_error& e) {
|
||||
- // For some reason a catch block that takes a lastfm::ws::ParseError&
|
||||
- // doesn't get called, even when a lastfm::ws::ParseError is thrown...
|
||||
- // Hacks like this remind me of Java...
|
||||
- if (QString(typeid(e).name()).contains("ParseError")) {
|
||||
- // dynamic_cast throws a std::bad_cast ... *boggle*
|
||||
+ } else {
|
||||
emit StreamError(tr("Couldn't load the last.fm radio station")
|
||||
- .arg(e.what()));
|
||||
- } else {
|
||||
- emit StreamError(tr("An unknown last.fm error occurred: %1").arg(e.what()));
|
||||
- }
|
||||
+ .arg(query.parseError().message()));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -913,7 +883,7 @@ void LastFMService::Tune(const QUrl& url
|
||||
|
||||
last_url_ = url;
|
||||
initial_tune_ = true;
|
||||
- const lastfm::RadioStation station(FixupUrl(url));
|
||||
+ const lastfm::RadioStation station(FixupUrl(url).toString());
|
||||
|
||||
playlist_.clear();
|
||||
|
||||
--- src/internet/lastfmservice.h
|
||||
+++ src/internet/lastfmservice.h
|
||||
@@ -27,7 +27,8 @@ class Track;
|
||||
uint qHash(const lastfm::Track& track);
|
||||
|
||||
#include "fixlastfm.h"
|
||||
-#include <lastfm/Track>
|
||||
+#include <lastfm/Audioscrobbler.h>
|
||||
+#include <lastfm/Track.h>
|
||||
#include <lastfm/ws.h>
|
||||
|
||||
#include "internetmodel.h"
|
||||
@@ -132,7 +133,8 @@ class LastFMService : public InternetSer
|
||||
void ScrobblingEnabledChanged(bool value);
|
||||
void ButtonVisibilityChanged(bool value);
|
||||
void ScrobbleButtonVisibilityChanged(bool value);
|
||||
- void ScrobblerStatus(int value);
|
||||
+ void ScrobbleSubmitted();
|
||||
+ void ScrobbleError(int value);
|
||||
void UpdatedSubscriberStatus(bool is_subscriber);
|
||||
void ScrobbledRadioStream();
|
||||
|
||||
--- src/songinfo/lastfmtrackinfoprovider.cpp
|
||||
+++ src/songinfo/lastfmtrackinfoprovider.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "ui/iconloader.h"
|
||||
|
||||
#include <lastfm/ws.h>
|
||||
-#include <lastfm/XmlQuery>
|
||||
+#include <lastfm/XmlQuery.h>
|
||||
|
||||
void LastfmTrackInfoProvider::FetchInfo(int id, const Song& metadata) {
|
||||
QMap<QString, QString> params;
|
||||
@@ -50,18 +50,12 @@ void LastfmTrackInfoProvider::RequestFin
|
||||
return;
|
||||
}
|
||||
|
||||
- try {
|
||||
- lastfm::XmlQuery query = lastfm::ws::parse(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
-
|
||||
+ lastfm::XmlQuery query;
|
||||
+ if (query.parse(reply->readAll())) {
|
||||
GetPlayCounts(id, query);
|
||||
GetWiki(id, query);
|
||||
GetTags(id, query);
|
||||
|
||||
- } catch (std::runtime_error&) {
|
||||
}
|
||||
emit Finished(id);
|
||||
}
|
||||
--- src/suggesters/lastfmsuggester.cpp
|
||||
+++ src/suggesters/lastfmsuggester.cpp
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "lastfmsuggester.h"
|
||||
|
||||
-#include <lastfm/XmlQuery>
|
||||
+#include <lastfm/XmlQuery.h>
|
||||
|
||||
#include "core/logging.h"
|
||||
#include "core/timeconstants.h"
|
||||
@@ -39,13 +39,8 @@ void LastFMSuggester::RequestFinished()
|
||||
int id = it.value();
|
||||
replies_.erase(it);
|
||||
|
||||
- try {
|
||||
- lastfm::XmlQuery const lfm = lastfm::ws::parse(reply);
|
||||
-#ifdef Q_OS_WIN32
|
||||
- if (lastfm::ws::last_parse_error != lastfm::ws::NoError)
|
||||
- throw std::runtime_error("");
|
||||
-#endif
|
||||
-
|
||||
+ lastfm::XmlQuery lfm;
|
||||
+ if (lfm.parse(reply->readAll())) {
|
||||
const QList<XmlQuery> tracks = lfm["similartracks"].children("track");
|
||||
SongList songs;
|
||||
foreach (const XmlQuery& q, tracks) {
|
||||
@@ -59,8 +54,8 @@ void LastFMSuggester::RequestFinished()
|
||||
}
|
||||
qLog(Debug) << songs.length() << "suggested songs from Last.fm";
|
||||
emit SuggestSongsFinished(id, songs);
|
||||
- } catch (std::runtime_error& e) {
|
||||
- qLog(Error) << e.what();
|
||||
+ } else {
|
||||
+ qLog(Error) << lfm.parseError().message();
|
||||
emit SuggestSongsFinished(id, SongList());
|
||||
}
|
||||
}
|
||||
--- src/ui/mainwindow.cpp
|
||||
+++ src/ui/mainwindow.cpp
|
||||
@@ -700,7 +700,8 @@ MainWindow::MainWindow(
|
||||
connect(player_->playlists()->sequence(), SIGNAL(ShuffleModeChanged(PlaylistSequence::ShuffleMode)), osd_, SLOT(ShuffleModeChanged(PlaylistSequence::ShuffleMode)));
|
||||
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
- connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobblerStatus(int)), SLOT(ScrobblerStatus(int)));
|
||||
+ connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobbleSubmitted()), SLOT(ScrobbleSubmitted()));
|
||||
+ connect(InternetModel::Service<LastFMService>(), SIGNAL(ScrobbleError(int)), SLOT(ScrobbleError(int)));
|
||||
|
||||
LastFMButtonVisibilityChanged(internet_model_->InternetModel::Service<LastFMService>()->AreButtonsVisible());
|
||||
ScrobbleButtonVisibilityChanged(internet_model_->InternetModel::Service<LastFMService>()->IsScrobbleButtonVisible());
|
||||
@@ -2201,30 +2202,26 @@ void MainWindow::SetToggleScrobblingIcon
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
-void MainWindow::ScrobblerStatus(int value) {
|
||||
+void MainWindow::ScrobbleSubmitted() {
|
||||
const LastFMService* lastfm_service = InternetModel::Service<LastFMService>();
|
||||
const bool last_fm_enabled = ui_->action_toggle_scrobbling->isVisible() &&
|
||||
lastfm_service->IsScrobblingEnabled() &&
|
||||
lastfm_service->IsAuthenticated();
|
||||
|
||||
+ playlists_->active()->set_lastfm_status(Playlist::LastFM_Scrobbled);
|
||||
+ // update the button icon
|
||||
+ if (last_fm_enabled)
|
||||
+ ui_->action_toggle_scrobbling->setIcon(QIcon(":/last.fm/as.png"));
|
||||
+}
|
||||
+
|
||||
+void MainWindow::ScrobbleError(int value) {
|
||||
+
|
||||
switch (value) {
|
||||
case -1:
|
||||
// custom error value got from initial validity check
|
||||
playlists_->active()->set_lastfm_status(Playlist::LastFM_Invalid);
|
||||
break;
|
||||
|
||||
- case 2:
|
||||
- case 3:
|
||||
- // we should get 3 for a correct scrobbling, but I just get 2 for
|
||||
- // mysterious reasons
|
||||
- // seems to scrobble fine though, so for now we accept it as correct
|
||||
- playlists_->active()->set_lastfm_status(Playlist::LastFM_Scrobbled);
|
||||
-
|
||||
- // update the button icon
|
||||
- if (last_fm_enabled)
|
||||
- ui_->action_toggle_scrobbling->setIcon(QIcon(":/last.fm/as.png"));
|
||||
- break;
|
||||
-
|
||||
case 30:
|
||||
// Hack: when offline, liblastfm doesn't inform us, so set the status
|
||||
// as queued; in this way we won't try to scrobble again, it will be done automatically
|
||||
--- src/ui/mainwindow.h
|
||||
+++ src/ui/mainwindow.h
|
||||
@@ -224,7 +224,8 @@ class MainWindow : public QMainWindow, p
|
||||
|
||||
void ShowCoverManager();
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
- void ScrobblerStatus(int value);
|
||||
+ void ScrobbleSubmitted();
|
||||
+ void ScrobbleError(int value);
|
||||
#endif
|
||||
void ShowAboutDialog();
|
||||
void ShowTranscodeDialog();
|
||||
--- tests/mpris1_test.cpp
|
||||
+++ tests/mpris1_test.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "playlist/playlistsequence.h"
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
#include "internet/fixlastfm.h"
|
||||
-#include <lastfm/Track>
|
||||
+#include <lastfm/Track.h>
|
||||
#endif
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
--- tests/song_test.cpp
|
||||
+++ tests/song_test.cpp
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "core/song.h"
|
||||
#ifdef HAVE_LIBLASTFM
|
||||
#include "internet/fixlastfm.h"
|
||||
-#include <lastfm/Track>
|
||||
+#include <lastfm/Track.h>
|
||||
#endif
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
@ -0,0 +1 @@
|
||||
DIST coquillo-1.12-src.tar.gz 570833 SHA256 5c1a46786e25dc3bb10ac063314aed173350cf6bc0436f181ad666d01899cd7d SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817 WHIRLPOOL 46046e32813cc46289694a8c010d026217143d59a19f0ccabdc356913fdf57867518fcf3ad61baebea7c1cc98568d9b6de619dbf3148ab10595954e9829f3cb5
|
||||
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/coquillo/coquillo-1.12.ebuild,v 1.1 2012/07/06 15:45:40 yngwin Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit qt4-r2
|
||||
|
||||
DESCRIPTION="GUI audio tagger based on Qt4 and taglib"
|
||||
HOMEPAGE="http://qt-apps.org/content/show.php/Coquillo?content=141896"
|
||||
SRC_URI="http://cs.joensuu.fi/~sjuvonen/${PN}/${PV}/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="|| ( GPL-2 GPL-3 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=media-libs/taglib-1.7
|
||||
>=x11-libs/qt-gui-4.6:4
|
||||
>=x11-libs/qt-core-4.6:4"
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sound</herd>
|
||||
<herd>qt</herd>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +1,2 @@
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 RMD160 0ad33f984b9beade23ca81aadeb64f8a23e3400c SHA1 77cedc3ddadefa02e6be7ff50210e53e045880be SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.70.tar.xz 4793076 SHA256 f9b6ff57005a4883042256b699451382ae5d3325e43f44097fbde3fdd77b859f SHA512 e3e5141c7f4b2061fc4e185c21a74f1674c1fa8219cec465d3401f90e6f9cd6a54df1dda40a8575e17e3278842586778e9f091f807c9e06dd4b3dd1544fbc837 WHIRLPOOL 52deb1476462c85119882851892e57af4f08e972e652a0de70b6a794beb3550a45626397664d49b523d7916649e84523f46dc5d54d20846c151d4491289fa642
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST leechcraft-0.4.99.tar.xz 4601736 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42 SHA512 c9cf056d0565dcf43d423173a71f89f27607cc6a5d254c9332846d368b499c77f1a036094321da88849de96bbcdf685b6bfd4e3e47e014f7df81fb4fc1443ef5 WHIRLPOOL a8be0fcacc0e5aed65fa39a9a0ad8f6c67bfe6f9b17db35f708b73a65378a5e07ffd45cd1af8365242f489041b47767093dca811fc3cb81662752cf021559fa0
|
||||
DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
|
||||
DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 RMD160 0ad33f984b9beade23ca81aadeb64f8a23e3400c SHA1 77cedc3ddadefa02e6be7ff50210e53e045880be SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.0.tar.xz 4691312 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
|
||||
DIST leechcraft-0.5.60.tar.xz 4743936 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.70.tar.xz 4793076 SHA256 f9b6ff57005a4883042256b699451382ae5d3325e43f44097fbde3fdd77b859f SHA512 e3e5141c7f4b2061fc4e185c21a74f1674c1fa8219cec465d3401f90e6f9cd6a54df1dda40a8575e17e3278842586778e9f091f807c9e06dd4b3dd1544fbc837 WHIRLPOOL 52deb1476462c85119882851892e57af4f08e972e652a0de70b6a794beb3550a45626397664d49b523d7916649e84523f46dc5d54d20846c151d4491289fa642
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
|
||||
DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 RMD160 4b1e37c734d124757cbaf7cdf35b487c95a3660a SHA1 4805580e618bddac42bbb4ba9d035f5d1d162caa SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc
|
||||
DIST TiMidity++-2.13.2.tar.bz2 1581230 SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 SHA512 0e35ad4c8745878daf63932143e60dc4bda0f3ef5d6f046cad74c8c57edf39a7d1d3f0f36758d5b11ace72e2661fba1629d30d90202e9573c07d1ea2b66a6bc1 WHIRLPOOL 134a903ce7f943b538783ee610e074ff279103443bf0b2a9ff10822af376bd31d291197202913aba1325e55ee55b9d20c6087e13a79f135018ed945e8e8c8ff4
|
||||
DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27bd380e0ef5e45de4158784538c86fc SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 WHIRLPOOL 0031a0e6519ead34c73ed3383d1d74b91b3e25c257854bd3325d25ec9c00bb55c036936ef4ef162ad13c255fefc4e46b802173e93b7ed575c92cf076ab03929b
|
||||
DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc SHA512 5199a608518f0d92a5dc2d469babe922949b6dd7c07197af3eca167024b20e57466e99baf731abda58a4025fd842d7670dbc01130cdb6eebef11d04f4c2a32ea WHIRLPOOL 2d7281a13512090a22498d5198b4ef2d6b3e74ed23a351b8b187686fdcadea59565b924c5887b04bedf4d3ff289f73952f1bb026ff4e37c30df28d7437453462
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -2245,10 +2245,15 @@
|
||||
|
||||
AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
|
||||
|
||||
-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
|
||||
-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
|
||||
-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
|
||||
-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
|
||||
+# These break flags like --param wrt #276433
|
||||
+# SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
|
||||
+# SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
|
||||
+# SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
|
||||
+# SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
|
||||
+LDFLAGS="$LDFLAGS"
|
||||
+SHLDFLAGS="$SHLDFLAGS"
|
||||
+CFLAGS="$EXTRACFLAGS $CFLAGS"
|
||||
+CPPFLAGS="$CPPFLAGS $EXTRADEFS"
|
||||
|
||||
if test "x$oss_device" != x; then
|
||||
AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)
|
||||
@ -0,0 +1,28 @@
|
||||
This will revert part of the commit from:
|
||||
|
||||
http://timidity.git.sourceforge.net/git/gitweb.cgi?p=timidity/timidity;a=commit;h=e73b53437dbc1e57e61dd4d0c1407784797b08d9
|
||||
|
||||
Because otherwise TiMidity++ simply won't build as per:
|
||||
|
||||
../interface/libinterface.a(xskin_c.o): In function `ctl_event':
|
||||
xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data'
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
--- interface/xskin_c.c
|
||||
+++ interface/xskin_c.c
|
||||
@@ -228,7 +228,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#if 0
|
||||
static void ctl_speana_data(double *val, int size) {
|
||||
|
||||
/* 0 <= val[n] <= (AMP*NCOLOR) */
|
||||
@@ -280,7 +279,6 @@
|
||||
|
||||
return;
|
||||
}
|
||||
-#endif
|
||||
|
||||
/*ARGSUSED*/
|
||||
static int ctl_open(int using_stdin, int using_stdout) {
|
||||
@ -0,0 +1,179 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0.ebuild,v 1.1 2012/07/07 07:48:46 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit autotools eutils elisp-common user
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_P=TiMidity++-${MY_PV}
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
|
||||
HOMEPAGE="http://timidity.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao speex flac ncurses"
|
||||
|
||||
DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
|
||||
emacs? ( virtual/emacs )
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
tk? ( dev-lang/tk )
|
||||
nas? ( >=media-libs/nas-1.4 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
slang? ( sys-libs/slang )
|
||||
jack? ( media-sound/jack-audio-connection-kit )
|
||||
vorbis? ( media-libs/libvorbis )
|
||||
flac? ( media-libs/flac )
|
||||
speex? ( media-libs/speex )
|
||||
ao? ( >=media-libs/libao-0.8.5 )
|
||||
motif? ( >=x11-libs/openmotif-2.3:0 )
|
||||
X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )"
|
||||
RDEPEND="${DEPEND}
|
||||
alsa? ( media-sound/alsa-utils )
|
||||
app-admin/eselect-timidity"
|
||||
|
||||
PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup audio 18 # Just make sure it exists
|
||||
enewuser timidity -1 -1 /var/lib/timidity audio
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-params.patch \
|
||||
"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export EXTRACFLAGS="${CFLAGS}" #385817
|
||||
|
||||
local myconf
|
||||
local audios
|
||||
|
||||
use flac && audios="${audios},flac"
|
||||
use speex && audios="${audios},speex"
|
||||
use vorbis && audios="${audios},vorbis"
|
||||
|
||||
use oss && audios="${audios},oss"
|
||||
use jack && audios="${audios},jack"
|
||||
use ao && audios="${audios},ao"
|
||||
|
||||
if use nas; then
|
||||
audios="${audios},nas"
|
||||
myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x"
|
||||
use X || ewarn "Basic X11 support will be enabled because required by nas."
|
||||
fi
|
||||
|
||||
if use alsa; then
|
||||
audios="${audios},alsa"
|
||||
myconf="${myconf} --with-default-output=alsa --enable-alsaseq"
|
||||
fi
|
||||
|
||||
# We disable motif by default and then only enable it if it's requested.
|
||||
if use motif; then
|
||||
myconf="${myconf} --enable-motif --with-x"
|
||||
use X || ewarn "Basic X11 support will be enabled because required by motif."
|
||||
fi
|
||||
|
||||
econf \
|
||||
--localstatedir=/var/state/timidity++ \
|
||||
--with-lispdir="${SITELISP}/${PN}" \
|
||||
--with-elf \
|
||||
--enable-audio=${audios} \
|
||||
--enable-server \
|
||||
--enable-network \
|
||||
--enable-dynamic \
|
||||
--enable-vt100 \
|
||||
--enable-spline=cubic \
|
||||
$(use_enable emacs) \
|
||||
$(use_enable slang) \
|
||||
$(use_enable ncurses) \
|
||||
$(use_with X x) \
|
||||
$(use_enable X spectrogram) \
|
||||
$(use_enable X wrd) \
|
||||
$(use_enable X xskin) \
|
||||
$(use_enable X xaw) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable tk tcltk) \
|
||||
--disable-motif \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS ChangeLog*
|
||||
dodoc NEWS README* "${FILESDIR}/timidity.cfg-r1"
|
||||
|
||||
# these are only for the ALSA sequencer mode
|
||||
if use alsa; then
|
||||
newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
|
||||
newinitd "${FILESDIR}"/init.d.timidity.4 timidity
|
||||
fi
|
||||
|
||||
insinto /etc
|
||||
newins "${FILESDIR}/timidity.cfg-r1" timidity.cfg
|
||||
|
||||
dodir /usr/share/timidity
|
||||
dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
|
||||
|
||||
if use emacs; then
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
diropts -o timidity -g nobody -m 0700
|
||||
keepdir /var/lib/timidity
|
||||
|
||||
doicon "${FILESDIR}"/timidity.xpm
|
||||
newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
|
||||
|
||||
# Order of preference: gtk, X (Xaw), ncurses, slang
|
||||
# Do not create menu item for terminal ones
|
||||
local interface="-id"
|
||||
local terminal="true"
|
||||
local nodisplay="true"
|
||||
if use gtk || use X; then
|
||||
interface="-ia"
|
||||
terminal="false"
|
||||
nodisplay="false"
|
||||
use gtk && interface="-ig"
|
||||
elif use ncurses || use slang; then
|
||||
local interface="-is"
|
||||
use ncurses && interface="-in"
|
||||
fi
|
||||
sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
|
||||
-e "s/Terminal=.*/Terminal=${terminal}/" \
|
||||
-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
|
||||
-i "${D}"/usr/share/applications/timidity.desktop || die "sed failed"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
|
||||
elog "A timidity config file has been installed in /etc/timidity.cfg."
|
||||
elog "Do not edit this file as it will interfere with the eselect timidity tool."
|
||||
elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
|
||||
|
||||
if use alsa; then
|
||||
elog "An init script for the alsa timidity sequencer has been installed."
|
||||
elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
|
||||
elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
|
||||
fi
|
||||
|
||||
if use sparc; then
|
||||
elog "Only saving to wave file and ALSA soundback has been tested working."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST cinelerra-20111223.tar.xz 22543128 RMD160 670c2c054b3e0bd573dfc47682357c02bba5dec8 SHA1 bdd7637e656ce8108df645cd2315f6c144f203e4 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b
|
||||
DIST cinelerra-20111223.tar.xz 22543128 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b SHA512 b488ecb81d7a1ba621af3bc4c47b412f5210a233cace2a174917464d1db241d198fe815b8b552643d64e991b87f527064380f56017e75cd562e728b1b50e6189 WHIRLPOOL d65dbfcba0efaf0266b9b5eb3ddde667b34d95d0ce931f2f51731c1ac1a9ce56f3d359fc96c751406bbd24a1297284fae745741a931d93b43acecdc4ba2badad
|
||||
DIST cinelerra-20120707.tar.xz 22542220 SHA256 b909531fd1f5a11b85463ea06a62f703f2be67cbe79cd90c035d569a3019f5ad SHA512 af5ed92c223c1e0658ea3320aeefb568b94299ec14947e422f845b72bb271e7592142ac3d119daa9ce2a1b15e708d5ae2214a051f6d4ba67bd3ec733fc607171 WHIRLPOOL add200da410aafb3ad8bd6113061ba055a57978b4f9b717275b0c22375968e7aaa6c5c5a1d0f1ce2c4da3a630b9218fe2e5ae795b30bdfbfb532a3d793fd6065
|
||||
|
||||
@ -0,0 +1,93 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20120707.ebuild,v 1.1 2012/07/07 06:53:16 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit autotools eutils multilib flag-o-matic
|
||||
|
||||
DESCRIPTION="The most advanced non-linear video editor and compositor"
|
||||
HOMEPAGE="http://www.cinelerra.org/"
|
||||
SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss"
|
||||
|
||||
RDEPEND="media-libs/a52dec
|
||||
media-libs/faac
|
||||
media-libs/faad2
|
||||
>=media-libs/freetype-2
|
||||
media-libs/libdv
|
||||
>=media-libs/libogg-1.2
|
||||
media-libs/libpng:0
|
||||
media-libs/libsndfile
|
||||
>=media-libs/libtheora-1.1
|
||||
>=media-libs/libvorbis-1.3
|
||||
>=media-libs/openexr-1.5
|
||||
media-libs/tiff:0
|
||||
media-libs/x264
|
||||
media-sound/lame
|
||||
>=media-video/mjpegtools-2
|
||||
>=sci-libs/fftw-3
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXft
|
||||
x11-libs/libXv
|
||||
x11-libs/libXvMC
|
||||
x11-libs/libXxf86vm
|
||||
virtual/ffmpeg
|
||||
virtual/jpeg
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
ieee1394? (
|
||||
media-libs/libiec61883
|
||||
>=sys-libs/libraw1394-1.2.0
|
||||
>=sys-libs/libavc1394-0.5.0
|
||||
)
|
||||
opengl? ( virtual/opengl )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
mmx? ( dev-lang/nasm )"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-entry.patch \
|
||||
"${FILESDIR}"/${PN}-ffmpeg.patch \
|
||||
"${FILESDIR}"/${PN}-underlinking.patch \
|
||||
"${FILESDIR}"/${PN}-ffmpeg-0.11.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -D__STDC_CONSTANT_MACROS #321945
|
||||
append-ldflags -Wl,-z,noexecstack #212959
|
||||
|
||||
econf \
|
||||
$(use_enable oss) \
|
||||
$(use_enable alsa) \
|
||||
--disable-esd \
|
||||
$(use_enable ieee1394 firewire) \
|
||||
$(use_enable css) \
|
||||
$(use_enable mmx) \
|
||||
$(use_enable 3dnow) \
|
||||
$(use_enable altivec) \
|
||||
$(use_enable opengl) \
|
||||
--with-plugindir=/usr/$(get_libdir)/${PN} \
|
||||
--with-buildinfo=cust/"Gentoo - ${PV}" \
|
||||
--with-external-ffmpeg
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dohtml -a png,html,texi,sdw -r doc/*
|
||||
|
||||
rm -rf "${D}"/usr/include
|
||||
mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
|
||||
mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
|
||||
mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
|
||||
dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
|
||||
|
||||
prune_libtool_files --all
|
||||
}
|
||||
@ -0,0 +1,156 @@
|
||||
Let it build with ffmpeg-0.11
|
||||
|
||||
Index: cinelerra-20111223/cinelerra/ffmpeg.C
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/cinelerra/ffmpeg.C
|
||||
+++ cinelerra-20111223/cinelerra/ffmpeg.C
|
||||
@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
|
||||
|
||||
int FFMPEG::init(char *codec_string) {
|
||||
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
|
||||
CodecID id = codec_id(codec_string);
|
||||
Index: cinelerra-20111223/cinelerra/fileac3.C
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/cinelerra/fileac3.C
|
||||
+++ cinelerra-20111223/cinelerra/fileac3.C
|
||||
@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr)
|
||||
|
||||
if(wr)
|
||||
{
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
codec = avcodec_find_encoder(CODEC_ID_AC3);
|
||||
if(!codec)
|
||||
Index: cinelerra-20111223/configure.in
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/configure.in
|
||||
+++ cinelerra-20111223/configure.in
|
||||
@@ -338,7 +338,7 @@ AC_SUBST(CPU_CFLAGS)
|
||||
AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
|
||||
|
||||
if test "x$with_external_ffmpeg" = "xyes"; then
|
||||
- PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
|
||||
+ PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
|
||||
FFMPEG_FOLDER=""
|
||||
FFMPEG_EXTERNALTEXT="External ffmpeg"
|
||||
|
||||
@@ -356,10 +356,10 @@ if test "x$with_external_ffmpeg" = "xyes
|
||||
AC_MSG_RESULT($enable_ffmpeg_swscale)
|
||||
if test x"$enable_ffmpeg_swscale" = xyes; then
|
||||
dnl AC_DEFINE(HAVE_SWSCALER)
|
||||
- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
|
||||
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
|
||||
FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
|
||||
else
|
||||
- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
|
||||
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
|
||||
fi
|
||||
FFMPEG_EXTERNALTEXT="External ffmpeg"
|
||||
else
|
||||
Index: cinelerra-20111223/quicktime/mpeg4.c
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/quicktime/mpeg4.c
|
||||
+++ cinelerra-20111223/quicktime/mpeg4.c
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
|
||||
#include "libavcodec/avcodec.h"
|
||||
+#include "libavutil/dict.h"
|
||||
#include "colormodels.h"
|
||||
#include "funcprotos.h"
|
||||
#include "qtffmpeg.h"
|
||||
@@ -624,12 +625,12 @@ static int encode(quicktime_t *file, uns
|
||||
else
|
||||
// ffmpeg section
|
||||
{
|
||||
+ AVDictionary ** opts = NULL;
|
||||
static char *video_rc_eq="tex^qComp";
|
||||
codec->encode_initialized[current_field] = 1;
|
||||
if(!ffmpeg_initialized)
|
||||
{
|
||||
ffmpeg_initialized = 1;
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
}
|
||||
|
||||
@@ -673,8 +674,10 @@ static int encode(quicktime_t *file, uns
|
||||
context->b_quant_offset = 1.25;
|
||||
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
|
||||
context->error_resilience = FF_ER_CAREFUL;
|
||||
-#else
|
||||
+#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
|
||||
context->error_recognition = FF_ER_CAREFUL;
|
||||
+#else
|
||||
+ context->err_recognition |= AV_EF_CAREFUL;
|
||||
#endif
|
||||
context->error_concealment = 3;
|
||||
context->frame_skip_cmp = FF_CMP_DCTMAX;
|
||||
@@ -699,7 +702,7 @@ static int encode(quicktime_t *file, uns
|
||||
context->profile= FF_PROFILE_UNKNOWN;
|
||||
context->rc_buffer_aggressivity = 1.0;
|
||||
context->level= FF_LEVEL_UNKNOWN;
|
||||
- context->flags |= CODEC_FLAG_H263P_UMV;
|
||||
+ av_dict_set(opts, "umv", "1", 0);
|
||||
context->flags |= CODEC_FLAG_AC_PRED;
|
||||
|
||||
// All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
|
||||
@@ -717,10 +720,8 @@ static int encode(quicktime_t *file, uns
|
||||
(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
|
||||
codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
|
||||
codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
|
||||
- codec->ffmpeg_id == CODEC_ID_H263P ||
|
||||
- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
|
||||
+ codec->ffmpeg_id == CODEC_ID_H263P ))
|
||||
{
|
||||
- avcodec_thread_init(context, file->cpus);
|
||||
context->thread_count = file->cpus;
|
||||
}
|
||||
|
||||
@@ -740,7 +741,7 @@ static int encode(quicktime_t *file, uns
|
||||
* codec->fix_bitrate,
|
||||
* codec->quantizer);
|
||||
*/
|
||||
- avcodec_open(context, codec->encoder[current_field]);
|
||||
+ avcodec_open2(context, codec->encoder[current_field], opts);
|
||||
|
||||
avcodec_get_frame_defaults(&codec->picture[current_field]);
|
||||
|
||||
Index: cinelerra-20111223/quicktime/qtffmpeg.c
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/quicktime/qtffmpeg.c
|
||||
+++ cinelerra-20111223/quicktime/qtffmpeg.c
|
||||
@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
|
||||
if(!ffmpeg_initialized)
|
||||
{
|
||||
ffmpeg_initialized = 1;
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
}
|
||||
|
||||
@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
|
||||
(ffmpeg_id == CODEC_ID_MPEG4 ||
|
||||
ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
|
||||
ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
|
||||
- ffmpeg_id == CODEC_ID_H263P ||
|
||||
- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
|
||||
+ ffmpeg_id == CODEC_ID_H263P ))
|
||||
{
|
||||
- avcodec_thread_init(context, cpus);
|
||||
context->thread_count = cpus;
|
||||
}
|
||||
if(avcodec_open(context,
|
||||
Index: cinelerra-20111223/quicktime/wma.c
|
||||
===================================================================
|
||||
--- cinelerra-20111223.orig/quicktime/wma.c
|
||||
+++ cinelerra-20111223/quicktime/wma.c
|
||||
@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_m
|
||||
if(!ffmpeg_initialized)
|
||||
{
|
||||
ffmpeg_initialized = 1;
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST ffmpeg-0.10.2.tar.bz2 5780204 RMD160 b9dd617935e106e4a1980167bdb7ec8d76d3f2f7 SHA1 743f44a71f93b14c9b26ca2424b0da8457cef4be SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
|
||||
DIST ffmpeg-0.10.3.tar.bz2 5855494 RMD160 1fa566eb75489ed48faf8f818561399b3d426791 SHA1 4fb6f682dbc1b4ea54178040d515fc3a4c05d415 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f
|
||||
DIST ffmpeg-0.11.1.tar.bz2 6073253 RMD160 f6eab5ffc87b98ca24bea7f83e85ff6a1e2e8711 SHA1 bf01742be60c2e6280371fc4189d5d28933f1a56 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
|
||||
DIST ffmpeg-0.10.2.tar.bz2 5780204 SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
|
||||
DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
|
||||
DIST ffmpeg-0.11.1.tar.bz2 6073253 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 RMD160 0ad33f984b9beade23ca81aadeb64f8a23e3400c SHA1 77cedc3ddadefa02e6be7ff50210e53e045880be SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.60.tar.xz 4743936 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
|
||||
DIST leechcraft-0.5.65.tar.xz 4817008 SHA256 2fdb3d17fbcaa58793cf1c0046851d9e3d6ede25bd57562aae572c9f64e1b38a
|
||||
DIST leechcraft-0.5.70.tar.xz 4793076 SHA256 f9b6ff57005a4883042256b699451382ae5d3325e43f44097fbde3fdd77b859f SHA512 e3e5141c7f4b2061fc4e185c21a74f1674c1fa8219cec465d3401f90e6f9cd6a54df1dda40a8575e17e3278842586778e9f091f807c9e06dd4b3dd1544fbc837 WHIRLPOOL 52deb1476462c85119882851892e57af4f08e972e652a0de70b6a794beb3550a45626397664d49b523d7916649e84523f46dc5d54d20846c151d4491289fa642
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
!<sys-apps/portage-2.1.10.58 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
|
||||
>=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp jinja? ( dev-python/jinja ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
|
||||
0
|
||||
mirror://github/saltstack/salt/salt-0.10.0.tar.gz
|
||||
|
||||
http://saltstack.org/
|
||||
Apache-2.0
|
||||
Salt is a remote execution and configuration manager.
|
||||
~x86 ~amd64
|
||||
eutils multilib python-distutils-ng toolchain-funcs user
|
||||
+jinja libvirt mongodb mysql redis python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
|
||||
|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
|
||||
|
||||
|
||||
4
|
||||
|
||||
compile configure install prepare test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue