root
10 years ago
parent
ae7a520bbc
commit
b367bed93d
@ -1,7 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>eselect@gentoo.org</email>
|
||||
</maintainer>
|
||||
<herd>eselect</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild,v 1.1 2014/07/14 02:52:20 patrick Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit multilib
|
||||
|
||||
DESCRIPTION="Utility to change the OpenCL implementation being used"
|
||||
HOMEPAGE="http://www.gentoo.org/"
|
||||
|
||||
# Source:
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
|
||||
# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
|
||||
|
||||
# Using copy by Mario Kicherer #496418
|
||||
|
||||
#MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/"
|
||||
SRC_URI="https://github.com/anyc/opencl-headers/archive/opencl-headers-1.2.tar.gz
|
||||
http://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-arch/xz-utils"
|
||||
RDEPEND=">=app-admin/eselect-1.2.4"
|
||||
|
||||
pkg_postinst() {
|
||||
local impl="$(eselect opencl show)"
|
||||
if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
|
||||
eselect opencl set "${impl}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/eselect/modules
|
||||
doins opencl.eselect
|
||||
#doman opencl.eselect.5
|
||||
|
||||
local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
|
||||
|
||||
# We install all versions of OpenCL headers
|
||||
cd "${WORKDIR}/opencl-headers-opencl-headers-1.2"
|
||||
for CL_ABI in 1.0 1.1 1.2; do
|
||||
mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
|
||||
for f in ${headers[@]}; do
|
||||
cp OpenCL-${CL_ABI}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}"
|
||||
done
|
||||
done
|
||||
# Create symlinks to newest. Maybe this should be switchable?
|
||||
for f in ${headers[@]}; do
|
||||
dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.1/${f}" "/usr/$(get_libdir)/OpenCL/global/include/CL/${f}"
|
||||
done
|
||||
}
|
||||
@ -1,7 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>eselect@gentoo.org</email>
|
||||
</maintainer>
|
||||
<herd>eselect</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>eselect@gentoo.org</email>
|
||||
</maintainer>
|
||||
<herd>eselect</herd>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST duply_1.7.3.tgz 34684 SHA256 e0ae298b06125bb6665a3f4822828d36e9f56c93755b45e2240fd1643e7f05d3 SHA512 e71d4bd03828a47cb7b5af164d9f49c911a837c1a016efe8832a56f9ec9913a5237bee0c89cd4a1aece6db454873e8c39e70224ab4c725e7a5ce5eae73e556ff WHIRLPOOL 6881a80c62537ed77e877fbe9c6700aa16e4efe14d4d851c12c31411f2c332ef7d79f85a6815aafbc57e27e6a397d9fa54360e7783bd12435e961b1f4f211bde
|
||||
DIST duply_1.7.4.tgz 34887 SHA256 2bbcd6e55fcaa7ae2c416a6ce2d3ae0bc219dd05049d8708ff0e79a3349599e7 SHA512 82b722af95d48e231c6540254fe659fc2ed2cdee5ebde3b1f7b192feac0b88ae44c834dde34417324ae0113bf5f8d621602f9587d1356347d606892da7b46405 WHIRLPOOL 6fbe7e1524feb482b796b2db5d39d7276f291f7107ea26db735716f3cbfedd9613b450dd2f06907a54b156d82140584ece2e58a850bca82fe2a7831cac90cc8b
|
||||
DIST duply_1.8.0.tgz 35252 SHA256 6642d812a741186d2e995289a682ba5f45149127f957da4c8ebd54fb5ac1f5e5 SHA512 8bb10fc98c44ce325f738fea8b46fd7c03132b681d1e98f8efc2e0b985b895a255a884ce5c99fcb9d1591fb37b5a7f2994ec309ef5ca9b9d2116816641d05d9b WHIRLPOOL 5281b624261aa586a8fc156ea498c3ab3579ccf47588af47d0c0678610b960cb29390359e5870e9817a7ac459e47eebc1fa555d1f1aae29d0cb4ad96914310e0
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.8.0.ebuild,v 1.1 2014/07/13 16:02:43 jlec Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit readme.gentoo
|
||||
|
||||
DESCRIPTION="A shell frontend for duplicity"
|
||||
HOMEPAGE="http://duply.net"
|
||||
SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-text/txt2man"
|
||||
RDEPEND="app-backup/duplicity"
|
||||
|
||||
S=${WORKDIR}/${PN}_${PV}
|
||||
|
||||
DOC_CONTENTS="
|
||||
If you use ${PN} at the first time please have a
|
||||
look at the the usage help text \"${PN} usage\"
|
||||
for further information."
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
./${PN} txt2man > ${PN}.1
|
||||
doman ${PN}.1
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
@ -1,8 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>eselect</herd>
|
||||
<herd>emacs</herd>
|
||||
<maintainer>
|
||||
<email>eselect@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
|
||||
===================================================================
|
||||
--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2013-02-05 21:34:52.000000000 +0000
|
||||
+++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2014-02-28 21:45:10.570587443 +0000
|
||||
@@ -481,9 +481,9 @@
|
||||
outs << codec.height;
|
||||
ar.addTriplet(streamuri, heightPropertyName, outs.str());
|
||||
}
|
||||
- if (stream.r_frame_rate.num && stream.r_frame_rate.den) {
|
||||
+ if (stream.avg_frame_rate.num && stream.avg_frame_rate.den) {
|
||||
ostringstream outs;
|
||||
- outs << stream.r_frame_rate.num / stream.r_frame_rate.den;
|
||||
+ outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den;
|
||||
ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
|
||||
}
|
||||
if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
|
||||
@ -0,0 +1,96 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.8-r1.ebuild,v 1.1 2014/07/13 11:50:06 johu Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
else
|
||||
EGIT_REPO_URI=( "git://anongit.kde.org/strigi" )
|
||||
GIT_ECLASS="git-r3"
|
||||
KEYWORDS=""
|
||||
fi
|
||||
|
||||
inherit cmake-utils ${GIT_ECLASS}
|
||||
|
||||
DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
|
||||
HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="clucene +dbus debug exif fam ffmpeg inotify log +qt4 test"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
dev-libs/libxml2:2
|
||||
sys-libs/zlib
|
||||
virtual/libiconv
|
||||
clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
|
||||
dbus? (
|
||||
sys-apps/dbus
|
||||
qt4? ( dev-qt/qtdbus:4 )
|
||||
)
|
||||
exif? ( media-gfx/exiv2:= )
|
||||
fam? ( virtual/fam )
|
||||
ffmpeg? ( virtual/ffmpeg )
|
||||
log? ( >=dev-libs/log4cxx-0.10.0 )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-util/cppunit )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-gcc-4.8.patch"
|
||||
"${FILESDIR}/${P}-libav10.patch"
|
||||
)
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
src_unpack() {
|
||||
git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
|
||||
git-r3_src_unpack
|
||||
pushd "${S}" > /dev/null || die
|
||||
git submodule foreach git checkout master || die
|
||||
popd > /dev/null || die
|
||||
}
|
||||
fi
|
||||
|
||||
src_configure() {
|
||||
# Enabled: POLLING (only reliable way to check for files changed.)
|
||||
# Disabled: xine - recommended upstream to keep it this way
|
||||
local mycmakeargs=(
|
||||
-DENABLE_POLLING=ON
|
||||
-DFORCE_DEPS=ON
|
||||
-DENABLE_REGENERATEXSD=OFF
|
||||
-DENABLE_XINE=OFF
|
||||
$(cmake-utils_use_enable clucene CLUCENE)
|
||||
$(cmake-utils_use_enable clucene CLUCENE_NG)
|
||||
$(cmake-utils_use_enable dbus)
|
||||
$(cmake-utils_use_enable exif EXIV2)
|
||||
$(cmake-utils_use_enable fam)
|
||||
$(cmake-utils_use_enable ffmpeg)
|
||||
$(cmake-utils_use_enable inotify)
|
||||
$(cmake-utils_use_enable log LOG4CXX)
|
||||
$(cmake-utils_use_enable qt4)
|
||||
$(cmake-utils_use_find_package test CPPUNIT)
|
||||
)
|
||||
|
||||
if use qt4; then
|
||||
mycmakeargs+=( -DENABLE_DBUS=ON )
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use clucene ; then
|
||||
elog "Because you didn't enable the clucene backend, strigi may not be functional."
|
||||
elog "If you intend to use standalone strigi indexer (not needed for KDE),"
|
||||
elog "be sure to reinstall app-misc/strigi with the clucene USE flag enabled."
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
|
||||
DIST poppler-0.26.1.tar.xz 1592884 SHA256 c8c959c3f605a17ed21e2cfec2d9379be5e0c801db4edad5e7b2e44a6cef214c SHA512 5012bd4df931d86fd856a961819a7dd15162efa106518eeb8677edd9a21a62cfeff593a24e57181dfaacbd9e91e8bf782f2199d147c5a5398042ee055feab14d WHIRLPOOL 251481b53a180c1856b5860c6520a531547370454e78d0547afd8646c29a0de67bb2d25bf96ce27a0b976ac2539472f5ae7e53a03eb3a0f739f64a86697cb794
|
||||
DIST poppler-0.26.2.tar.xz 1592696 SHA256 1dd9963a82eba00b7a8c9f57a7d1d787be22f5e6cb0aead5dfe602775d0d9526 SHA512 1c8aa7a71b7f818a40fa3f886b54c627a600183a3d8b5b6e98439e1d3c7f5a1c7f0f6f8f5d685e9e19c539a2e11c5781de93f9032c88609e5b6eb32ee596ed9a WHIRLPOOL 85429392b904bd8ff7eb002f8858dfddd98fa53019934971e38117a46a1fbd9e7960e389f3e348ea484d1a9407abacc23be284f10481fc5882dda900fa50554e
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.1.ebuild,v 1.1 2014/05/23 22:49:52 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils toolchain-funcs
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="http://poppler.freedesktop.org/"
|
||||
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/46"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:0 )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.4 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
|
||||
|
||||
src_configure() {
|
||||
# this is needed for multilib, see bug 459394
|
||||
local ft_libdir ft_includedir
|
||||
ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
|
||||
ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
|
||||
export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
|
||||
einfo "Detected FreeType at ${FREETYPE_DIR}"
|
||||
|
||||
mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT4_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
$(cmake-utils_use_enable curl LIBCURL)
|
||||
$(cmake-utils_use_enable cxx CPP)
|
||||
$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
|
||||
$(cmake-utils_use_enable utils)
|
||||
$(cmake-utils_use_with cairo)
|
||||
$(cmake-utils_use_with introspection GObjectIntrospection)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_with qt4)
|
||||
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||
$(cmake-utils_use_with tiff)
|
||||
)
|
||||
if use lcms; then
|
||||
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_CMS=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use cairo && use doc; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST zathura-0.2.7.tar.gz 145007 SHA256 ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf SHA512 7e6a5f54a4d49e5e81f993619a4497d202958f047f71d26b19682326a3c191e643e6db5efa69ae8ba4de332191bbd226c3dc79d6e63986fdae7faded17666725 WHIRLPOOL 77bbe78ee955f3936395127ec62216e1231a83260a0567e899ffe8891497104f75a6699df1e5dfa8d59b55bf07a8d153b2bb0d61c3140a97b47b3439f11e3bb8
|
||||
DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.9.ebuild,v 1.1 2014/07/13 16:25:58 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils fdo-mime multilib toolchain-funcs virtualx
|
||||
[[ ${PV} == 9999* ]] && inherit git-2
|
||||
|
||||
DESCRIPTION="A highly customizable and functional document viewer"
|
||||
HOMEPAGE="http://pwmt.org/projects/zathura/"
|
||||
if ! [[ ${PV} == 9999* ]]; then
|
||||
SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
|
||||
fi
|
||||
EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
if ! [[ ${PV} == 9999* ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
else
|
||||
KEYWORDS=""
|
||||
fi
|
||||
IUSE="+magic sqlite test"
|
||||
|
||||
RDEPEND=">=dev-libs/girara-0.2.2:3=
|
||||
>=dev-libs/glib-2.28:2=
|
||||
x11-libs/cairo:=
|
||||
>=x11-libs/gtk+-3.2:3
|
||||
magic? ( sys-apps/file:= )
|
||||
sqlite? ( dev-db/sqlite:3= )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
test? ( dev-libs/check )"
|
||||
|
||||
pkg_setup() {
|
||||
myzathuraconf=(
|
||||
WITH_MAGIC=$(usex magic 1 0)
|
||||
WITH_SQLITE=$(usex sqlite 1 0)
|
||||
PREFIX="${EPREFIX}"/usr
|
||||
LIBDIR='${PREFIX}'/$(get_libdir)
|
||||
CC="$(tc-getCC)"
|
||||
SFLAGS=''
|
||||
VERBOSE=1
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake "${myzathuraconf[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
Xemake "${myzathuraconf[@]}" test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake "${myzathuraconf[@]}" install
|
||||
dodoc AUTHORS
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST gflags-2.0.tar.gz 513739 SHA256 ce4a5d3419f27a080bd68966e5cd9507bfa09d14341e07b78a1778a7a172d7d7 SHA512 ba7061d5d57fcadb53ef70f846caacc44c319552e7dd6b05def38f961d3d89f4023e4eda95845efb399f3e94f24f75bdadfc67b22e29bccc94e46de8db501b83 WHIRLPOOL a86acb21e91bdcaebd6b6c97079ae147c7549c6db29a5c8ebf1917b9ae8703523efef285837d328702d64aaa83bd4810e1ecae65dc58eb12379ab2f0300dd19e
|
||||
DIST gflags-2.1.1.tar.gz 102015 SHA256 432edece8102fc141c2e3381e2eb5eabb1ce7614851cc96bdec4715105086238 SHA512 18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef WHIRLPOOL 608dc62262d8b4a0451dd3493b02fd35ad5214f1793f173ca5d93e631e15b59cc4557b2a2f9f5e67f72c2ad0d6cd343648b113bf4701fd8f6c3f5d949ac41813
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.1 2014/07/14 03:34:01 patrick Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit cmake-multilib multilib-minimal
|
||||
|
||||
DESCRIPTION="Google's C++ argument parsing library"
|
||||
HOMEPAGE="http://code.google.com/p/gflags/"
|
||||
SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
multilib_src_install_all() {
|
||||
rm -rf "${ED}"/usr/share/doc
|
||||
dodoc {AUTHORS,ChangeLog,NEWS,README}.txt
|
||||
dohtml doc/*
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST girara-0.2.0.tar.gz 66130 SHA256 d14b54cb04d81ba3b84ad41c5e68951d250b455d0862add1c987e3af9e2e174d SHA512 00ab1f6881c5afcd03835049b60536f2330f391e56d9ef6555c57716bf95e53d06cc4b2416ed09c816658f97a982c606a9bb9981754cbad654ddeb5c54b471b2 WHIRLPOOL f02900a5a717b40a682e012b59e227d8e8ad3f0dcc2f4c927e10789923ea6c0d6d2e423a0075bd0d8ec4442029ff8bcede2c1a338f8fdbab2f56d639fd7db0cb
|
||||
DIST girara-0.2.2.tar.gz 72553 SHA256 6382dfdf1cc7ddfedf3d1ece5a7f07590c49b4932184ee8dec6d2bd121e66653 SHA512 216f737843523542697f995c08792adfaa0961414b7002d9b2740cc54f6fc94e61cbf06d5a71fa3e56637ad7594fe8c7cf5abb96784ff492c8305c2a7848ec8d WHIRLPOOL 4301b58585a11df21de19ca01b5a2f6c894e607106113860b3b562da1e986cb558ee6a062e40ea3b4a20d9b224a9289683c4098c30619edfa8cce3f82a2b0221
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.2.2.ebuild,v 1.1 2014/07/13 16:22:34 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib toolchain-funcs
|
||||
[[ ${PV} == 9999* ]] && inherit git-2
|
||||
|
||||
DESCRIPTION="A library that implements a user interface that focuses on simplicity and minimalism"
|
||||
HOMEPAGE="http://pwmt.org/projects/girara/"
|
||||
if ! [[ ${PV} == 9999* ]]; then
|
||||
SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
|
||||
fi
|
||||
EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="3"
|
||||
if ! [[ ${PV} == 9999* ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
else
|
||||
KEYWORDS=""
|
||||
fi
|
||||
IUSE="libnotify static-libs"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.28
|
||||
>=x11-libs/gtk+-3.2:3
|
||||
!<${CATEGORY}/${PN}-0.1.6
|
||||
libnotify? ( >=x11-libs/libnotify-0.7 )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_setup() {
|
||||
mygiraraconf=(
|
||||
WITH_LIBNOTIFY=$(usex libnotify 1 0)
|
||||
PREFIX="${EPREFIX}"/usr
|
||||
LIBDIR='${PREFIX}'/$(get_libdir)
|
||||
CC="$(tc-getCC)"
|
||||
SFLAGS=''
|
||||
VERBOSE=1
|
||||
DESTDIR="${D}"
|
||||
)
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Remove 'static' and 'install-static' targets
|
||||
if ! use static-libs; then
|
||||
sed -i \
|
||||
-e '/^${PROJECT}:/s:static::' \
|
||||
-e '/^install:/s:install-static::' \
|
||||
Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake "${mygiraraconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake "${mygiraraconf[@]}" install
|
||||
dodoc AUTHORS
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Net-SSLeay-1.55.tar.gz 394657 SHA256 8cd5f09722e07b4e436102cb3a4b93623d753c171665ca9752c3b39a62ea3a79 SHA512 204928a95937b31216008986692ef96370ab6623c9238b69a10452db40ce0b1d50d97813c53eca6debb5f605afa946fd4a468fd32fa63572c275ce0ad33ab855 WHIRLPOOL bdbe27149c4e3f041c6a10da78f7513d8e5b602159f83a2e93047c0f6079d60f1d0d6d23d0211a7e20bdb8aa35b96b87dfbf733e5199b5b9ca2ab7b6308b51e8
|
||||
DIST Net-SSLeay-1.58.tar.gz 399353 SHA256 0bdc50c19df545eb2f9e434458ee2b54e97b109315dafb476044b9039e783f56 SHA512 88d768ac5b8dc3dbbfe2715ed91fc4dd887febcc31316e06e40a875de98db95ca87452ad02df7ee74063c0ba9a171bbef02679577e4d219fcea1b21cf0399761 WHIRLPOOL 04a5c6423d35d4415ef03f2bcda945efff580d5081695e83b8be8349ab1c3c9f79651874ad75e81709eb2d94473815fbee0ede8812e0417767af5bfa2af59820
|
||||
DIST Net-SSLeay-1.64.tar.gz 411886 SHA256 9354e6b153d571ad612a211ce9732980944adb581997801f4643cda6e12d80b2 SHA512 cf469b6d7fdea853682d1d2e34be71948f75d2d5ca7ce1222be15f707843f0683cf348bff50f010ea55522904ea22a84e0a688fdbba70a5e6f6d28ebd2bf0de4 WHIRLPOOL c487a44edb2793957fd39491028e0946265c40de627c31e24326e8fbb3aa7fd9a8b153dda4c006e9bfb19bda2233aae76f3a39c9ef3e552ab3cb49b2c012a62d
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.640.0.ebuild,v 1.1 2014/07/13 18:13:06 zlogene Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=MIKEM
|
||||
MODULE_VERSION=1.64
|
||||
inherit multilib perl-module
|
||||
|
||||
DESCRIPTION="Net::SSLeay module for perl"
|
||||
|
||||
LICENSE="openssl"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/openssl"
|
||||
DEPEND="${RDEPEND}"
|
||||
# test? ( dev-perl/Test-Exception
|
||||
# dev-perl/Test-Warn
|
||||
# dev-perl/Test-NoWarnings )"
|
||||
|
||||
#SRC_TEST=do
|
||||
|
||||
export OPTIMIZE="$CFLAGS"
|
||||
export OPENSSL_PREFIX=${EPREFIX}/usr
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e "/\$opts->{optimize} = '-O2 -g';/d" \
|
||||
-e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
|
||||
inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
|
||||
perl-module_src_prepare
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST 2.2.0.tar.gz 251829 SHA256 b8453879b475837ca32d0d43d4b36bb0b6f217d6546ef3890a2bc0d03e19c2ca SHA512 bec38cb529a90cce8ed3ad458efaabc9dc614694492f03b722ffda24e73e3a0786d06c51c79535de42a3e8bd52a194c520755579e6488dcd6499cd7cabef9ce2 WHIRLPOOL fbd61c7e8bf15dc1d44947c885a4b5729eb6b4e07d325b83a6d08cf4c43850eb60dc497777a37dcee99ab1068f859d974cec865fc49e3385b786fdbf8ba469cc
|
||||
DIST 2.2.4.tar.gz 283710 SHA256 6c4f915fc5b76a5ac5aade7f134eb00a56c80e236738930e724e731af8475194 SHA512 980df76d1faf3ab982f905c1a6934eb19a98b460ed58327df141bf2ff84cf155e809b735ce446d0feb7462fcf03a835dce56e2a549f60d9954b010d5c0cebd18 WHIRLPOOL 190a14b05ed242488024eb413bd2d9d66baddc1c65ec1852a541693e0290f7d6b4e1bfb789ff027a443a924b57d1a56dea1b846a7d523a5338082d97ed6a941b
|
||||
DIST 2.2.5.tar.gz 290931 SHA256 c58245d96ed12aea03b90778078014a733f6a0b078e260c30ab32b339c28f888 SHA512 91938071acff3ace02dec2a421727937c6799d914a254ff2fc95bca068544169c79a02914fd0ab8c8e36f530c72c59a8123b971d280187bc9692cdcb52b9e3f9 WHIRLPOOL cebf8a0506099b2da0a48f8df7f8c82f5004f3861757c16a6a7d70a2844d592cf6338e5a67d36333fbc3398ebef415ea6728128f8ef63ecc0ddf37dbf4c8d884
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/peewee/peewee-2.2.5.ebuild,v 1.1 2014/07/13 15:00:17 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
|
||||
PYTHON_REQ_USE="sqlite(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Small python ORM"
|
||||
HOMEPAGE="https://github.com/coleifer/peewee/"
|
||||
SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc examples test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/apsw[${PYTHON_USEDEP}]
|
||||
dev-python/psycopg[${PYTHON_USEDEP}]
|
||||
dev-python/django[${PYTHON_USEDEP}]
|
||||
)"
|
||||
# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C docs html
|
||||
}
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/_build/html/. )
|
||||
use examples && local EXAMPLES=( example/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.8.ebuild,v 1.1 2014/07/13 07:56:16 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
# pypy pending actioning of bug filed upstream
|
||||
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
|
||||
HOMEPAGE="http://pypi.python.org/pypi/pycountry"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ia64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="app-arch/unzip
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
DOCS=( HISTORY.txt README TODO.txt )
|
||||
|
||||
python_test() {
|
||||
# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
|
||||
# and STILL
|
||||
pushd "${BUILD_DIR}"/lib > /dev/null
|
||||
if [[ "${EPYTHON}" == pypy ]]; then
|
||||
sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
|
||||
fi
|
||||
py.test ${PN}/tests/test_general.py || die
|
||||
popd > /dev/null
|
||||
}
|
||||
@ -0,0 +1,321 @@
|
||||
http://bugs.python.org/issue1222585
|
||||
|
||||
--- Lib/distutils/cygwinccompiler.py
|
||||
+++ Lib/distutils/cygwinccompiler.py
|
||||
@@ -117,8 +117,10 @@
|
||||
# dllwrap 2.10.90 is buggy
|
||||
if self.ld_version >= "2.10.90":
|
||||
self.linker_dll = "gcc"
|
||||
+ self.linker_dll_cxx = "g++"
|
||||
else:
|
||||
self.linker_dll = "dllwrap"
|
||||
+ self.linker_dll_cxx = "dllwrap"
|
||||
|
||||
# ld_version >= "2.13" support -shared so use it instead of
|
||||
# -mdll -static
|
||||
@@ -132,9 +134,13 @@
|
||||
self.set_executables(compiler='gcc -mcygwin -O -Wall',
|
||||
compiler_so='gcc -mcygwin -mdll -O -Wall',
|
||||
compiler_cxx='g++ -mcygwin -O -Wall',
|
||||
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
|
||||
linker_exe='gcc -mcygwin',
|
||||
linker_so=('%s -mcygwin %s' %
|
||||
- (self.linker_dll, shared_option)))
|
||||
+ (self.linker_dll, shared_option)),
|
||||
+ linker_exe_cxx='g++ -mcygwin',
|
||||
+ linker_so_cxx=('%s -mcygwin %s' %
|
||||
+ (self.linker_dll_cxx, shared_option)))
|
||||
|
||||
# cygwin and mingw32 need different sets of libraries
|
||||
if self.gcc_version == "2.91.57":
|
||||
@@ -160,8 +166,12 @@
|
||||
raise CompileError, msg
|
||||
else: # for other files use the C-compiler
|
||||
try:
|
||||
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
|
||||
- extra_postargs)
|
||||
+ if self.detect_language(src) == 'c++':
|
||||
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
+ else:
|
||||
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
except DistutilsExecError, msg:
|
||||
raise CompileError, msg
|
||||
|
||||
@@ -327,9 +337,14 @@
|
||||
self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
|
||||
compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
|
||||
compiler_cxx='g++%s -O -Wall' % no_cygwin,
|
||||
+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
|
||||
linker_exe='gcc%s' % no_cygwin,
|
||||
linker_so='%s%s %s %s'
|
||||
% (self.linker_dll, no_cygwin,
|
||||
+ shared_option, entry_point),
|
||||
+ linker_exe_cxx='g++%s' % no_cygwin,
|
||||
+ linker_so_cxx='%s%s %s %s'
|
||||
+ % (self.linker_dll_cxx, no_cygwin,
|
||||
shared_option, entry_point))
|
||||
# Maybe we should also append -mthreads, but then the finished
|
||||
# dlls need another dll (mingwm10.dll see Mingw32 docs)
|
||||
--- Lib/distutils/emxccompiler.py
|
||||
+++ Lib/distutils/emxccompiler.py
|
||||
@@ -65,8 +65,12 @@
|
||||
# XXX optimization, warnings etc. should be customizable.
|
||||
self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
|
||||
compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
|
||||
+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
|
||||
+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
|
||||
linker_exe='gcc -Zomf -Zmt -Zcrtdll',
|
||||
- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
|
||||
+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
|
||||
+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
|
||||
+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
|
||||
|
||||
# want the gcc library statically linked (so that we don't have
|
||||
# to distribute a version dependent on the compiler we have)
|
||||
@@ -83,8 +87,12 @@
|
||||
raise CompileError, msg
|
||||
else: # for other files use the C-compiler
|
||||
try:
|
||||
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
|
||||
- extra_postargs)
|
||||
+ if self.detect_language(src) == 'c++':
|
||||
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
+ else:
|
||||
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
except DistutilsExecError, msg:
|
||||
raise CompileError, msg
|
||||
|
||||
--- Lib/distutils/sysconfig_cpython.py
|
||||
+++ Lib/distutils/sysconfig_cpython.py
|
||||
@@ -170,10 +170,12 @@
|
||||
_osx_support.customize_compiler(_config_vars)
|
||||
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
|
||||
|
||||
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
|
||||
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
|
||||
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
|
||||
- 'ARFLAGS')
|
||||
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
|
||||
+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
|
||||
+ 'SO', 'AR', 'ARFLAGS')
|
||||
+
|
||||
+ cflags = ''
|
||||
+ cxxflags = ''
|
||||
|
||||
if 'CC' in os.environ:
|
||||
newcc = os.environ['CC']
|
||||
@@ -188,19 +190,27 @@
|
||||
cxx = os.environ['CXX']
|
||||
if 'LDSHARED' in os.environ:
|
||||
ldshared = os.environ['LDSHARED']
|
||||
+ if 'LDCXXSHARED' in os.environ:
|
||||
+ ldcxxshared = os.environ['LDCXXSHARED']
|
||||
if 'CPP' in os.environ:
|
||||
cpp = os.environ['CPP']
|
||||
else:
|
||||
cpp = cc + " -E" # not always
|
||||
if 'LDFLAGS' in os.environ:
|
||||
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
|
||||
if 'CFLAGS' in os.environ:
|
||||
- cflags = opt + ' ' + os.environ['CFLAGS']
|
||||
+ cflags = os.environ['CFLAGS']
|
||||
ldshared = ldshared + ' ' + os.environ['CFLAGS']
|
||||
+ if 'CXXFLAGS' in os.environ:
|
||||
+ cxxflags = os.environ['CXXFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
|
||||
if 'CPPFLAGS' in os.environ:
|
||||
cpp = cpp + ' ' + os.environ['CPPFLAGS']
|
||||
cflags = cflags + ' ' + os.environ['CPPFLAGS']
|
||||
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
|
||||
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
|
||||
if 'AR' in os.environ:
|
||||
ar = os.environ['AR']
|
||||
if 'ARFLAGS' in os.environ:
|
||||
@@ -209,13 +219,17 @@
|
||||
archiver = ar + ' ' + ar_flags
|
||||
|
||||
cc_cmd = cc + ' ' + cflags
|
||||
+ cxx_cmd = cxx + ' ' + cxxflags
|
||||
compiler.set_executables(
|
||||
preprocessor=cpp,
|
||||
compiler=cc_cmd,
|
||||
compiler_so=cc_cmd + ' ' + ccshared,
|
||||
- compiler_cxx=cxx,
|
||||
+ compiler_cxx=cxx_cmd,
|
||||
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
|
||||
linker_so=ldshared,
|
||||
linker_exe=cc,
|
||||
+ linker_so_cxx=ldcxxshared,
|
||||
+ linker_exe_cxx=cxx,
|
||||
archiver=archiver)
|
||||
|
||||
compiler.shared_lib_extension = so_ext
|
||||
--- Lib/distutils/unixccompiler.py
|
||||
+++ Lib/distutils/unixccompiler.py
|
||||
@@ -55,14 +55,17 @@
|
||||
# are pretty generic; they will probably have to be set by an outsider
|
||||
# (eg. using information discovered by the sysconfig about building
|
||||
# Python extensions).
|
||||
- executables = {'preprocessor' : None,
|
||||
- 'compiler' : ["cc"],
|
||||
- 'compiler_so' : ["cc"],
|
||||
- 'compiler_cxx' : ["cc"],
|
||||
- 'linker_so' : ["cc", "-shared"],
|
||||
- 'linker_exe' : ["cc"],
|
||||
- 'archiver' : ["ar", "-cr"],
|
||||
- 'ranlib' : None,
|
||||
+ executables = {'preprocessor' : None,
|
||||
+ 'compiler' : ["cc"],
|
||||
+ 'compiler_so' : ["cc"],
|
||||
+ 'compiler_cxx' : ["c++"],
|
||||
+ 'compiler_so_cxx' : ["c++"],
|
||||
+ 'linker_so' : ["cc", "-shared"],
|
||||
+ 'linker_exe' : ["cc"],
|
||||
+ 'linker_so_cxx' : ["c++", "-shared"],
|
||||
+ 'linker_exe_cxx' : ["c++"],
|
||||
+ 'archiver' : ["ar", "-cr"],
|
||||
+ 'ranlib' : None,
|
||||
}
|
||||
|
||||
if sys.platform[:6] == "darwin":
|
||||
@@ -112,12 +115,19 @@
|
||||
|
||||
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
|
||||
compiler_so = self.compiler_so
|
||||
+ compiler_so_cxx = self.compiler_so_cxx
|
||||
if sys.platform == 'darwin':
|
||||
compiler_so = _osx_support.compiler_fixup(compiler_so,
|
||||
cc_args + extra_postargs)
|
||||
+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
|
||||
+ cc_args + extra_postargs)
|
||||
try:
|
||||
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
|
||||
- extra_postargs)
|
||||
+ if self.detect_language(src) == 'c++':
|
||||
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
+ else:
|
||||
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
|
||||
+ extra_postargs)
|
||||
except DistutilsExecError, msg:
|
||||
raise CompileError, msg
|
||||
|
||||
@@ -174,23 +184,16 @@
|
||||
ld_args.extend(extra_postargs)
|
||||
self.mkpath(os.path.dirname(output_filename))
|
||||
try:
|
||||
- if target_desc == CCompiler.EXECUTABLE:
|
||||
- linker = self.linker_exe[:]
|
||||
+ if target_lang == "c++":
|
||||
+ if target_desc == CCompiler.EXECUTABLE:
|
||||
+ linker = self.linker_exe_cxx[:]
|
||||
+ else:
|
||||
+ linker = self.linker_so_cxx[:]
|
||||
else:
|
||||
- linker = self.linker_so[:]
|
||||
- if target_lang == "c++" and self.compiler_cxx:
|
||||
- # skip over environment variable settings if /usr/bin/env
|
||||
- # is used to set up the linker's environment.
|
||||
- # This is needed on OSX. Note: this assumes that the
|
||||
- # normal and C++ compiler have the same environment
|
||||
- # settings.
|
||||
- i = 0
|
||||
- if os.path.basename(linker[0]) == "env":
|
||||
- i = 1
|
||||
- while '=' in linker[i]:
|
||||
- i = i + 1
|
||||
-
|
||||
- linker[i] = self.compiler_cxx[i]
|
||||
+ if target_desc == CCompiler.EXECUTABLE:
|
||||
+ linker = self.linker_exe[:]
|
||||
+ else:
|
||||
+ linker = self.linker_so[:]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
linker = _osx_support.compiler_fixup(linker, ld_args)
|
||||
--- Lib/_osx_support.py
|
||||
+++ Lib/_osx_support.py
|
||||
@@ -14,13 +14,13 @@
|
||||
# configuration variables that may contain universal build flags,
|
||||
# like "-arch" or "-isdkroot", that may need customization for
|
||||
# the user environment
|
||||
-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
|
||||
- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
|
||||
- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
|
||||
- 'PY_CORE_CFLAGS')
|
||||
+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
|
||||
+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
|
||||
+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
|
||||
+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
|
||||
|
||||
# configuration variables that may contain compiler calls
|
||||
-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
|
||||
+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
|
||||
|
||||
# prefix added to original configuration variable names
|
||||
_INITPRE = '_OSX_SUPPORT_INITIAL_'
|
||||
--- a/distutils/sysconfig_pypy.py
|
||||
+++ b/distutils/sysconfig_pypy.py
|
||||
@@ -123,7 +123,55 @@
|
||||
optional C speedup components.
|
||||
"""
|
||||
if compiler.compiler_type == "unix":
|
||||
- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
|
||||
+ cc = ' '.join(compiler.compiler)
|
||||
+ cxx = ' '.join(compiler.compiler_cxx)
|
||||
+ ldshared = ' '.join(compiler.linker_so)
|
||||
+ ldcxxshared = ' '.join(compiler.linker_so_cxx)
|
||||
+
|
||||
+ cflags = ''
|
||||
+ cxxflags = ''
|
||||
+ ccshared = '-fPIC'
|
||||
+
|
||||
+ if 'CC' in os.environ:
|
||||
+ cc = os.environ['CC']
|
||||
+ if 'CXX' in os.environ:
|
||||
+ cxx = os.environ['CXX']
|
||||
+ if 'LDSHARED' in os.environ:
|
||||
+ ldshared = os.environ['LDSHARED']
|
||||
+ if 'LDCXXSHARED' in os.environ:
|
||||
+ ldcxxshared = os.environ['LDCXXSHARED']
|
||||
+ if 'CPP' in os.environ:
|
||||
+ cpp = os.environ['CPP']
|
||||
+ else:
|
||||
+ cpp = cc + " -E" # not always
|
||||
+ if 'LDFLAGS' in os.environ:
|
||||
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
|
||||
+ if 'CFLAGS' in os.environ:
|
||||
+ cflags = os.environ['CFLAGS']
|
||||
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
|
||||
+ if 'CXXFLAGS' in os.environ:
|
||||
+ cxxflags = os.environ['CXXFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
|
||||
+ if 'CPPFLAGS' in os.environ:
|
||||
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
|
||||
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
|
||||
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
|
||||
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
|
||||
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
|
||||
+
|
||||
+ cc_cmd = cc + ' ' + cflags
|
||||
+ cxx_cmd = cxx + ' ' + cxxflags
|
||||
+ compiler.set_executables(
|
||||
+ preprocessor=cpp,
|
||||
+ compiler=cc_cmd,
|
||||
+ compiler_so=cc_cmd + ' ' + ccshared,
|
||||
+ compiler_cxx=cxx_cmd,
|
||||
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
|
||||
+ linker_so=ldshared,
|
||||
+ linker_exe=cc,
|
||||
+ linker_so_cxx=ldcxxshared,
|
||||
+ linker_exe_cxx=cxx)
|
||||
compiler.shared_lib_extension = get_config_var('SO')
|
||||
if "CPPFLAGS" in os.environ:
|
||||
cppflags = shlex.split(os.environ["CPPFLAGS"])
|
||||
@ -1,4 +1,3 @@
|
||||
DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
|
||||
DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
|
||||
DIST pypy-2.3-src.tar.bz2 14658373 SHA256 be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c SHA512 fbbe8fb06abdee9e0cd330ebeb6ea4769d3d0bf1271f84ed5b8fc94558b72abda677f17ef2c743160b823287cf901aefb139a7eb56f5252e082d525a0806f33c WHIRLPOOL f0f771c0c9e91fedbcac97ad0e9f318c379c6d343af2450f98f9000b032867eea89a53fff0895f48da22a4327a24440319fe7efddb56d24a80b8e4aedfa0c91d
|
||||
DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST rb-gsl-1.15.3.1.gem 611840 SHA256 56bda6faba85ba1e1142acee114e676d8e0778f951784c2d1c4a4bdb36ae4ecc SHA512 7c57923ac4858f95cb47f12778cbc6eca3149a8af58c81f535d7c5d24302d78fe359ea2eba5999a41a8ba48378abd7fb69587f62310eb9bdaf4e6ec76b7e00f6 WHIRLPOOL e976c2df65136f64b128e3466735377905d964863c0443949098902d09c083b165d805c4da481308c141c36dbeccd11260fa78319c7329f2981182534619adb0
|
||||
DIST rb-gsl-1.16.0.1.gem 589824 SHA256 5a171bf1fc84fab3c723f9682961f37c12d83c26f5975173079bf5cf75688683 SHA512 47caf27546e3054be9cef14bd062752c8d1d52b4118f5faa1f98cec688601cdd75eaca4fb43d4711547e61eef8ca5397d32b7320631fa1c9cb0a1225dcaead20 WHIRLPOOL d01638a9fb0900c31dd15c9a0f78978c927484c17b03b50989e11c8794974ec7ced61b908745b5c5bd0140bdf64c5b61974530fc492262bcac8c444b34a4c760
|
||||
DIST rb-gsl-1.16.0.2.gem 589312 SHA256 53e6db6f357284b6238c6293dac4f3b3c724055bc8c72549e8a6a3d277293f44 SHA512 a0b31ba681060aac56d8be5f667fcebf5dfe4b4cd010b5a12e83b3be5209cdbe3fb515a1ce43928920b7d28804d5ca0061c3160d31fdf4e03f5b06aa064a5ed8 WHIRLPOOL ec5d5579630c265a4fde6591225a73f4b917b207d1a6dd01836925ff57a499a68f954e52e061c06e0a7e9d1aecc8a9414baea8f22199d867d07cc4fe57a8c7f6
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild,v 1.1 2014/07/13 07:11:25 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
inherit ruby-fakegem multilib
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||
RUBY_FAKEGEM_EXTRADOC="ChangeLog README"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="test:libs"
|
||||
DESCRIPTION="Ruby interface to GNU Scientific Library"
|
||||
HOMEPAGE="https://github.com/david-macmahon/rb-gsl"
|
||||
#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND+=" sci-libs/gsl"
|
||||
RDEPEND+=" sci-libs/gsl"
|
||||
|
||||
RUBY_S="${PN}-${P}"
|
||||
|
||||
ruby_add_rdepend "dev-ruby/narray"
|
||||
|
||||
each_ruby_prepare() {
|
||||
sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext/gsl extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext/gsl V=1
|
||||
cp ext/gsl/*$(get_modname) lib/gsl || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -S testrb -Ilib -Itest test/*.rb test/*/*.rb || die
|
||||
}
|
||||
@ -1,4 +1 @@
|
||||
DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
|
||||
DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 SHA512 05ac2293300bf15fdcf98f07dfa7b9862b117cd0d6f7e30c1995ecb8a3bfd94e2b7e778caaa05bc46bd88eca5afe7f6be38b1904275a9a2aeae562bfdbaeec94 WHIRLPOOL 28365c3d091eb41fdbd428d3f9de37ed547c68415bd726874587af1cefd81ed6dce8255527dbee9d3019a65cf1b1416b9f09dfb744befba4c1428da8f88e3907
|
||||
DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
|
||||
DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
|
||||
|
||||
@ -1,181 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.14 2014/06/10 00:25:30 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
CMAKE_REMOVE_MODULES="no"
|
||||
inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="http://www.cmake.org/"
|
||||
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
|
||||
|
||||
LICENSE="CMake"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE="emacs ncurses qt4 vim-syntax"
|
||||
|
||||
DEPEND="
|
||||
>=app-arch/libarchive-2.8.0:=
|
||||
>=dev-libs/expat-2.0.1
|
||||
>=net-misc/curl-7.20.0-r1[ssl]
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
VIMFILE="${PN}.vim"
|
||||
|
||||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
|
||||
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
|
||||
"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
|
||||
"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
|
||||
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-desktop.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-libform.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindImageMagick.patch
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
# Cleanup args to extract only JOBS.
|
||||
# Because bootstrap does not know anything else.
|
||||
echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
|
||||
par_arg="--parallel=${par_arg}"
|
||||
else
|
||||
par_arg="--parallel=1"
|
||||
fi
|
||||
|
||||
tc-export CC CXX LD
|
||||
|
||||
# bootstrap script isn't exactly /bin/sh compatible
|
||||
${CONFIG_SHELL:-sh} ./bootstrap \
|
||||
--prefix="${T}/cmakestrap/" \
|
||||
${par_arg} \
|
||||
|| die "Bootstrap failed"
|
||||
}
|
||||
|
||||
cmake_src_test() {
|
||||
# fix OutDir test
|
||||
# this is altered thanks to our eclass
|
||||
sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
|
||||
|
||||
pushd "${CMAKE_BUILD_DIR}" > /dev/null
|
||||
|
||||
local ctestargs
|
||||
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
|
||||
|
||||
# Excluded tests:
|
||||
# BootstrapTest: we actualy bootstrap it every time so why test it.
|
||||
# CTest.updatecvs, which fails to commit as root
|
||||
# Qt4Deploy, which tries to break sandbox and ignores prefix
|
||||
# TestUpload, which requires network access
|
||||
"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
|
||||
-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug 387227
|
||||
addpredict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# disable running of cmake in boostrap command
|
||||
sed -i \
|
||||
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
|
||||
bootstrap || die "sed failed"
|
||||
|
||||
# Add gcc libs to the default link paths
|
||||
sed -i \
|
||||
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
|
||||
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
|
||||
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
|
||||
|
||||
cmake_src_bootstrap
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# make things work with gentoo java setup
|
||||
# in case java-config cannot be run, the variable just becomes unset
|
||||
# per bug #315229
|
||||
export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
|
||||
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
|
||||
-DCMAKE_DOC_DIR=/share/doc/${PF}
|
||||
-DCMAKE_MAN_DIR=/share/man
|
||||
-DCMAKE_DATA_DIR=/share/${PN}
|
||||
$(cmake-utils_use_build ncurses CursesDialog)
|
||||
$(cmake-utils_use_build qt4 QtDialog)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
use emacs && elisp-compile Docs/cmake-mode.el
|
||||
}
|
||||
|
||||
src_test() {
|
||||
VIRTUALX_COMMAND="cmake_src_test" virtualmake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
if use emacs; then
|
||||
elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins Docs/cmake-syntax.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/indent
|
||||
doins Docs/cmake-indent.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/${VIMFILE}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,200 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.10 2014/06/10 00:26:03 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
CMAKE_REMOVE_MODULES="no"
|
||||
inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="http://www.cmake.org/"
|
||||
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="CMake"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE="emacs ncurses qt4 qt5 vim-syntax"
|
||||
|
||||
REQUIRED_USE="?? ( qt4 qt5 )"
|
||||
|
||||
DEPEND="
|
||||
>=app-arch/libarchive-2.8.0:=
|
||||
>=dev-libs/expat-2.0.1
|
||||
>=net-misc/curl-7.20.0-r1[ssl]
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
vim-syntax? (
|
||||
|| (
|
||||
app-editors/vim
|
||||
app-editors/gvim
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
VIMFILE="${PN}.vim"
|
||||
|
||||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
|
||||
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
|
||||
"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
|
||||
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-desktop.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-libform.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11.2-hppa-bootstrap.patch
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
# Cleanup args to extract only JOBS.
|
||||
# Because bootstrap does not know anything else.
|
||||
echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
|
||||
par_arg="--parallel=${par_arg}"
|
||||
else
|
||||
par_arg="--parallel=1"
|
||||
fi
|
||||
|
||||
tc-export CC CXX LD
|
||||
|
||||
# bootstrap script isn't exactly /bin/sh compatible
|
||||
${CONFIG_SHELL:-sh} ./bootstrap \
|
||||
--prefix="${T}/cmakestrap/" \
|
||||
${par_arg} \
|
||||
|| die "Bootstrap failed"
|
||||
}
|
||||
|
||||
cmake_src_test() {
|
||||
# fix OutDir and SelectLibraryConfigurations tests
|
||||
# these are altered thanks to our eclass
|
||||
sed -i -e 's:#IGNORE ::g' \
|
||||
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|
||||
|| die
|
||||
|
||||
pushd "${CMAKE_BUILD_DIR}" > /dev/null
|
||||
|
||||
local ctestargs
|
||||
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
|
||||
|
||||
# Excluded tests:
|
||||
# BootstrapTest: we actualy bootstrap it every time so why test it.
|
||||
# CTest.updatecvs, which fails to commit as root
|
||||
# Qt4Deploy, which tries to break sandbox and ignores prefix
|
||||
# TestUpload, which requires network access
|
||||
"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
|
||||
-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug 387227
|
||||
addpredict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# disable running of cmake in boostrap command
|
||||
sed -i \
|
||||
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
|
||||
bootstrap || die "sed failed"
|
||||
|
||||
# Add gcc libs to the default link paths
|
||||
sed -i \
|
||||
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
|
||||
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
|
||||
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
|
||||
|
||||
cmake_src_bootstrap
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# make things work with gentoo java setup
|
||||
# in case java-config cannot be run, the variable just becomes unset
|
||||
# per bug #315229
|
||||
export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
|
||||
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
|
||||
-DCMAKE_DOC_DIR=/share/doc/${PF}
|
||||
-DCMAKE_MAN_DIR=/share/man
|
||||
-DCMAKE_DATA_DIR=/share/${PN}
|
||||
$(cmake-utils_use_build ncurses CursesDialog)
|
||||
)
|
||||
|
||||
if use qt4 || use qt5 ; then
|
||||
mycmakeargs+=(
|
||||
-DBUILD_QtDialog=ON
|
||||
$(cmake-utils_use_find_package qt5 Qt5Widgets)
|
||||
)
|
||||
fi
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
use emacs && elisp-compile Docs/cmake-mode.el
|
||||
}
|
||||
|
||||
src_test() {
|
||||
VIRTUALX_COMMAND="cmake_src_test" virtualmake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
if use emacs; then
|
||||
elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins Docs/cmake-syntax.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/indent
|
||||
doins Docs/cmake-indent.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/${VIMFILE}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,199 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r4.ebuild,v 1.2 2014/06/10 00:25:30 vapier Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
CMAKE_REMOVE_MODULES="no"
|
||||
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Cross platform Make"
|
||||
HOMEPAGE="http://www.cmake.org/"
|
||||
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="CMake"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE="emacs ncurses qt4 qt5"
|
||||
|
||||
REQUIRED_USE="?? ( qt4 qt5 )"
|
||||
|
||||
DEPEND="
|
||||
>=app-arch/libarchive-2.8.0:=
|
||||
>=dev-libs/expat-2.0.1
|
||||
>=net-misc/curl-7.20.0-r1[ssl]
|
||||
sys-libs/zlib
|
||||
virtual/pkgconfig
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
emacs? ( virtual/emacs )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
|
||||
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
|
||||
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
|
||||
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-desktop.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10-libform.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
|
||||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
|
||||
"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
|
||||
"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
|
||||
)
|
||||
|
||||
cmake_src_bootstrap() {
|
||||
# Cleanup args to extract only JOBS.
|
||||
# Because bootstrap does not know anything else.
|
||||
echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
|
||||
par_arg="--parallel=${par_arg}"
|
||||
else
|
||||
par_arg="--parallel=1"
|
||||
fi
|
||||
|
||||
# execinfo.h on Solaris isn't quite what it is on Darwin
|
||||
if [[ ${CHOST} == *-solaris* ]] ; then
|
||||
sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
tc-export CC CXX LD
|
||||
|
||||
# bootstrap script isn't exactly /bin/sh compatible
|
||||
${CONFIG_SHELL:-sh} ./bootstrap \
|
||||
--prefix="${T}/cmakestrap/" \
|
||||
${par_arg} \
|
||||
|| die "Bootstrap failed"
|
||||
}
|
||||
|
||||
cmake_src_test() {
|
||||
# fix OutDir and SelectLibraryConfigurations tests
|
||||
# these are altered thanks to our eclass
|
||||
sed -i -e 's:#IGNORE ::g' \
|
||||
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|
||||
|| die
|
||||
|
||||
pushd "${BUILD_DIR}" > /dev/null
|
||||
|
||||
local ctestargs
|
||||
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
|
||||
|
||||
# Excluded tests:
|
||||
# BootstrapTest: we actualy bootstrap it every time so why test it.
|
||||
# CTest.updatecvs, which fails to commit as root
|
||||
# Qt4Deploy, which tries to break sandbox and ignores prefix
|
||||
# TestUpload, which requires network access
|
||||
"${BUILD_DIR}"/bin/ctest ${ctestargs} \
|
||||
-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
|
||||
|| die "Tests failed"
|
||||
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug 387227
|
||||
addpredict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# disable running of cmake in boostrap command
|
||||
sed -i \
|
||||
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
|
||||
bootstrap || die "sed failed"
|
||||
|
||||
# Add gcc libs to the default link paths
|
||||
sed -i \
|
||||
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
|
||||
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
|
||||
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
|
||||
|
||||
cmake_src_bootstrap
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# make things work with gentoo java setup
|
||||
# in case java-config cannot be run, the variable just becomes unset
|
||||
# per bug #315229
|
||||
export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
|
||||
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
|
||||
-DCMAKE_DOC_DIR=/share/doc/${PF}
|
||||
-DCMAKE_MAN_DIR=/share/man
|
||||
-DCMAKE_DATA_DIR=/share/${PN}
|
||||
$(cmake-utils_use_build ncurses CursesDialog)
|
||||
)
|
||||
|
||||
if use qt4 || use qt5 ; then
|
||||
mycmakeargs+=(
|
||||
-DBUILD_QtDialog=ON
|
||||
$(cmake-utils_use_find_package qt5 Qt5Widgets)
|
||||
)
|
||||
fi
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
use emacs && elisp-compile Docs/cmake-mode.el
|
||||
}
|
||||
|
||||
src_test() {
|
||||
VIRTUALX_COMMAND="cmake_src_test" virtualmake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
if use emacs; then
|
||||
elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins Docs/cmake-syntax.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/indent
|
||||
doins Docs/cmake-indent.vim
|
||||
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
doins "${FILESDIR}/${PN}.vim"
|
||||
|
||||
dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
|
||||
rm -rf "${D}/usr/share/cmake/completions" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
The install_name of a library can be compared to the ELF soname, setting
|
||||
it to just the library name (libx.1.dylib) is not sufficient on Mach-O,
|
||||
as it uses full paths. Most apps have no clue about that, so they don't
|
||||
do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html
|
||||
|
||||
Provide a sane default that will allow merging most cmake-based
|
||||
packages. If this location is not correct, Portage's QA checks will
|
||||
catch that.
|
||||
|
||||
--- Source/cmTarget.cxx
|
||||
+++ Source/cmTarget.cxx
|
||||
@@ -974,7 +974,7 @@
|
||||
this->Makefile->IsOn("MINGW"));
|
||||
|
||||
// Setup default property values.
|
||||
- this->SetPropertyDefault("INSTALL_NAME_DIR", "");
|
||||
+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib");
|
||||
this->SetPropertyDefault("INSTALL_RPATH", "");
|
||||
this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
|
||||
this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
|
||||
@ -1,134 +0,0 @@
|
||||
From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
|
||||
From: Michael Palimaka <kensington@gentoo.org>
|
||||
Date: Tue, 6 Nov 2012 23:35:34 +1100
|
||||
Subject: [PATCH] Set some proper paths to make cmake find our tools.
|
||||
|
||||
The ebuild now adds an extra / at the end of $EPREFIX so that it is
|
||||
never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
|
||||
correct)
|
||||
|
||||
Original patch by Heiko Przybyl.
|
||||
Updated by Chris Reffett (cmake-2.8.8)
|
||||
Updated by Johannes Huber (cmake-2.8.9)
|
||||
Updated by Michael Palimaka (cmake-2.8.10)
|
||||
---
|
||||
Modules/Platform/Darwin.cmake | 12 +++++++----
|
||||
Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
|
||||
2 files changed, 29 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
|
||||
index a401762..775e547 100644
|
||||
--- a/Modules/Platform/Darwin.cmake
|
||||
+++ b/Modules/Platform/Darwin.cmake
|
||||
@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
|
||||
"<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
|
||||
|
||||
|
||||
-# default to searching for frameworks first
|
||||
+# default to searching for frameworks last
|
||||
if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
|
||||
- set(CMAKE_FIND_FRAMEWORK FIRST)
|
||||
+ set(CMAKE_FIND_FRAMEWORK LAST)
|
||||
endif()
|
||||
# set up the default search directories for frameworks
|
||||
set(CMAKE_SYSTEM_FRAMEWORK_PATH
|
||||
+ @GENTOO_PORTAGE_EPREFIX@Frameworks
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
/Network/Library/Frameworks
|
||||
/System/Library/Frameworks)
|
||||
|
||||
-# default to searching for application bundles first
|
||||
+# default to searching for application bundles last
|
||||
if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
|
||||
- set(CMAKE_FIND_APPBUNDLE FIRST)
|
||||
+ set(CMAKE_FIND_APPBUNDLE LAST)
|
||||
endif()
|
||||
# set up the default search directories for application bundles
|
||||
set(_apps_paths)
|
||||
foreach(_path
|
||||
+ @GENTOO_PORTAGE_EPREFIX@Applications
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/bin
|
||||
"~/Applications"
|
||||
"/Applications"
|
||||
"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
|
||||
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
|
||||
index ccb2663..0501d53 100644
|
||||
--- a/Modules/Platform/UnixPaths.cmake
|
||||
+++ b/Modules/Platform/UnixPaths.cmake
|
||||
@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
|
||||
# search types.
|
||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
# Standard
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
|
||||
/usr/local /usr /
|
||||
|
||||
# CMake install location
|
||||
@@ -44,43 +45,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||
|
||||
# List common include file locations not under the common prefixes.
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
- # Windows API on Cygwin
|
||||
- /usr/include/w32api
|
||||
-
|
||||
- # X11
|
||||
- /usr/X11R6/include /usr/include/X11
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/include
|
||||
- /opt/csw/include /opt/include
|
||||
- /usr/openwin/include
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||
- # Windows API on Cygwin
|
||||
- /usr/lib/w32api
|
||||
-
|
||||
- # X11
|
||||
- /usr/X11R6/lib /usr/lib/X11
|
||||
-
|
||||
- # Other
|
||||
- /usr/pkg/lib
|
||||
- /opt/csw/lib /opt/lib
|
||||
- /usr/openwin/lib
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
+ @GENTOO_PORTAGE_EPREFIX@lib
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||
- /usr/pkg/bin
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/bin
|
||||
+ @GENTOO_PORTAGE_EPREFIX@bin
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
- /lib /usr/lib /usr/lib32 /usr/lib64
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
|
||||
+ @GENTOO_PORTAGE_GCCLIBDIR@
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
|
||||
+ @GENTOO_PORTAGE_EPREFIX@lib
|
||||
+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
|
||||
)
|
||||
|
||||
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
/usr/include
|
||||
)
|
||||
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||
+ @GENTOO_PORTAGE_EPREFIX@usr/include
|
||||
/usr/include
|
||||
)
|
||||
|
||||
--
|
||||
1.8.0
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
http://bugs.gentoo.org/465898
|
||||
|
||||
--- Modules/FindImageMagick.cmake
|
||||
+++ Modules/FindImageMagick.cmake
|
||||
@@ -81,7 +81,7 @@
|
||||
${ImageMagick_INCLUDE_DIRS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||||
PATH_SUFFIXES
|
||||
- ImageMagick
|
||||
+ ImageMagick ImageMagick-6
|
||||
DOC "Path to the ImageMagick include dir."
|
||||
)
|
||||
find_library(ImageMagick_${component}_LIBRARY
|
||||
@@ -147,17 +147,17 @@
|
||||
)
|
||||
if(component STREQUAL "Magick++")
|
||||
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
|
||||
- Magick++ CORE_RL_Magick++_
|
||||
+ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
|
||||
elseif(component STREQUAL "MagickWand")
|
||||
FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
|
||||
- Wand MagickWand CORE_RL_wand_
|
||||
+ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
|
||||
elseif(component STREQUAL "MagickCore")
|
||||
FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
|
||||
- Magick MagickCore CORE_RL_magick_
|
||||
+ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
|
||||
else()
|
||||
@ -1,139 +0,0 @@
|
||||
--- a/Source/cmLocalGenerator.cxx
|
||||
+++ b/Source/cmLocalGenerator.cxx
|
||||
@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags(
|
||||
void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
cmGeneratorTarget* target,
|
||||
const char* lang,
|
||||
- const char *config)
|
||||
+ const char *config,
|
||||
+ bool stripImplicitInclDirs
|
||||
+ )
|
||||
{
|
||||
// Need to decide whether to automatically include the source and
|
||||
// binary directories at the beginning of the include path.
|
||||
@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
return;
|
||||
}
|
||||
|
||||
- // Load implicit include directories for this language.
|
||||
- std::string impDirVar = "CMAKE_";
|
||||
- impDirVar += lang;
|
||||
- impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
|
||||
- if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
|
||||
+ if (stripImplicitInclDirs)
|
||||
{
|
||||
- std::vector<std::string> impDirVec;
|
||||
- cmSystemTools::ExpandListArgument(value, impDirVec);
|
||||
- for(std::vector<std::string>::const_iterator i = impDirVec.begin();
|
||||
- i != impDirVec.end(); ++i)
|
||||
+ // Load implicit include directories for this language.
|
||||
+ std::string impDirVar = "CMAKE_";
|
||||
+ impDirVar += lang;
|
||||
+ impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
|
||||
+ if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
|
||||
{
|
||||
- emitted.insert(*i);
|
||||
+ std::vector<std::string> impDirVec;
|
||||
+ cmSystemTools::ExpandListArgument(value, impDirVec);
|
||||
+ for(std::vector<std::string>::const_iterator i = impDirVec.begin();
|
||||
+ i != impDirVec.end(); ++i)
|
||||
+ {
|
||||
+ emitted.insert(*i);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--- a/Source/cmLocalGenerator.h
|
||||
+++ b/Source/cmLocalGenerator.h
|
||||
@@ -212,7 +212,8 @@ public:
|
||||
/** Get the include flags for the current makefile and language. */
|
||||
void GetIncludeDirectories(std::vector<std::string>& dirs,
|
||||
cmGeneratorTarget* target,
|
||||
- const char* lang = "C", const char *config = 0);
|
||||
+ const char* lang = "C", const char *config = 0,
|
||||
+ bool stripImplicitInclDirs = true);
|
||||
|
||||
/** Compute the language used to compile the given source file. */
|
||||
const char* GetSourceFileLanguage(const cmSourceFile& source);
|
||||
--- a/Source/cmQtAutomoc.cxx
|
||||
+++ b/Source/cmQtAutomoc.cxx
|
||||
@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
|
||||
}
|
||||
|
||||
|
||||
- const char* qtIncDir = 0;
|
||||
- const char* qtCoreIncDir = 0;
|
||||
-
|
||||
- // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs,
|
||||
- // see http://public.kitware.com/Bug/view.php?id=13667
|
||||
- bool qtIncludeDirMayHaveBeenRemoved = false;
|
||||
- if (makefile->IsSet("QT_INCLUDE_DIR"))
|
||||
- {
|
||||
- qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR");
|
||||
- std::string s =
|
||||
- makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
|
||||
- std::vector<std::string> implIncDirs;
|
||||
- cmSystemTools::ExpandListArgument(s, implIncDirs);
|
||||
- if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir))
|
||||
- != implIncDirs.end())
|
||||
- {
|
||||
- qtIncludeDirMayHaveBeenRemoved = true;
|
||||
- if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR"))
|
||||
- {
|
||||
- qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR");
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- bool haveQtCoreIncDir = false;
|
||||
- bool haveQtIncDir = false;
|
||||
-
|
||||
std::vector<std::string> includeDirs;
|
||||
cmGeneratorTarget gtgt(target);
|
||||
- localGen->GetIncludeDirectories(includeDirs, >gt, "CXX");
|
||||
+ // Get the include dirs for this target, without stripping the implicit
|
||||
+ // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
|
||||
+ localGen->GetIncludeDirectories(includeDirs, >gt, "CXX", 0, false);
|
||||
std::string _moc_incs = "";
|
||||
const char* sep = "";
|
||||
for(std::vector<std::string>::const_iterator incDirIt = includeDirs.begin();
|
||||
@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
|
||||
_moc_incs += sep;
|
||||
sep = ";";
|
||||
_moc_incs += *incDirIt;
|
||||
-
|
||||
- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667
|
||||
- {
|
||||
- if (*incDirIt == qtIncDir)
|
||||
- {
|
||||
- haveQtIncDir = true;
|
||||
- qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed
|
||||
- }
|
||||
- if (*incDirIt == qtCoreIncDir)
|
||||
- {
|
||||
- haveQtCoreIncDir = true;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- // Some projects (kdelibs, phonon) query the compiler for its default
|
||||
- // include search dirs, and add those to
|
||||
- // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
|
||||
- // These may include e.g./usr/lib/qt/include . This is typically also part
|
||||
- // of ${QT_INCLUDES}. If this directory is then contained in the implicit
|
||||
- // include dirs, it is removed from the include dirs returned from the
|
||||
- // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected
|
||||
- // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't
|
||||
- // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think.
|
||||
- // See #13646 and #13667.
|
||||
- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir
|
||||
- && (haveQtCoreIncDir == true) && (haveQtIncDir == false))
|
||||
- {
|
||||
- _moc_incs += sep;
|
||||
- sep = ";";
|
||||
- _moc_incs += qtIncDir;
|
||||
}
|
||||
|
||||
const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
|
||||
--
|
||||
1.7.0
|
||||
@ -1,34 +0,0 @@
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=465898
|
||||
|
||||
--- Modules/FindImageMagick.cmake
|
||||
+++ Modules/FindImageMagick.cmake
|
||||
@@ -81,7 +81,7 @@
|
||||
${ImageMagick_INCLUDE_DIRS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||||
PATH_SUFFIXES
|
||||
- ImageMagick
|
||||
+ ImageMagick ImageMagick-6
|
||||
DOC "Path to the ImageMagick include dir."
|
||||
)
|
||||
find_library(ImageMagick_${component}_LIBRARY
|
||||
@@ -147,17 +147,17 @@
|
||||
)
|
||||
if(component STREQUAL "Magick++")
|
||||
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
|
||||
- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
|
||||
+ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
|
||||
elseif(component STREQUAL "MagickWand")
|
||||
FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
|
||||
- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
|
||||
+ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
|
||||
elseif(component STREQUAL "MagickCore")
|
||||
FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
|
||||
- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
|
||||
+ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
|
||||
else()
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/CompileFlags.cmake
|
||||
+++ b/CompileFlags.cmake
|
||||
@@ -66,5 +66,5 @@
|
||||
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode
|
||||
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
|
||||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
|
||||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
|
||||
endif ()
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -691,7 +691,7 @@
|
||||
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode
|
||||
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
|
||||
if ${cmake_machine_parisc}; then
|
||||
- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
|
||||
+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake
|
||||
--- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100
|
||||
+++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100
|
||||
@@ -1,3 +1,9 @@
|
||||
+#
|
||||
+# Version modified for Gentoo Linux
|
||||
+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
|
||||
+# all further checks.
|
||||
+#
|
||||
+
|
||||
# - Find BLAS library
|
||||
# This module finds an installed fortran library that implements the BLAS
|
||||
# linear-algebra interface (see http://www.netlib.org/blas/).
|
||||
@@ -39,6 +45,24 @@
|
||||
# (To distribute this file outside of CMake, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
+#
|
||||
+# first, try PkgConfig
|
||||
+#
|
||||
+find_package(PkgConfig REQUIRED)
|
||||
+pkg_check_modules(PC_BLAS blas)
|
||||
+if(PC_BLAS_FOUND)
|
||||
+ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
|
||||
+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
|
||||
+ if (NOT ${PC_LIB}_LIBRARY)
|
||||
+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
|
||||
+ endif (NOT ${PC_LIB}_LIBRARY)
|
||||
+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
|
||||
+ endforeach(PC_LIB)
|
||||
+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
|
||||
+ mark_as_advanced(BLAS_LIBRARIES)
|
||||
+else(PC_BLAS_FOUND)
|
||||
+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
|
||||
+
|
||||
include(CheckFunctionExists)
|
||||
include(CheckFortranFunctionExists)
|
||||
|
||||
@@ -622,3 +646,6 @@
|
||||
endif(BLA_F95)
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
+
|
||||
+endif(PC_BLAS_FOUND)
|
||||
+
|
||||
@ -1,73 +0,0 @@
|
||||
--- Modules/FindBoost.cmake
|
||||
+++ Modules/FindBoost.cmake
|
||||
@@ -953,6 +953,11 @@
|
||||
set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
|
||||
set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
|
||||
|
||||
+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
|
||||
+ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
|
||||
+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
|
||||
+ endif()
|
||||
+
|
||||
#
|
||||
# Find RELEASE libraries
|
||||
#
|
||||
@@ -962,6 +967,14 @@
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT} )
|
||||
+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
|
||||
+ list(APPEND _boost_RELEASE_NAMES
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
|
||||
+ endif()
|
||||
if(_boost_STATIC_RUNTIME_WORKAROUND)
|
||||
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
|
||||
list(APPEND _boost_RELEASE_NAMES
|
||||
@@ -969,6 +982,13 @@
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
|
||||
+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
|
||||
+ list(APPEND _boost_RELEASE_NAMES
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
|
||||
+ endif()
|
||||
endif()
|
||||
if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
|
||||
_Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
|
||||
@@ -994,6 +1014,15 @@
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT} )
|
||||
+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
|
||||
+ list(APPEND _boost_DEBUG_NAMES
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
|
||||
+ endif()
|
||||
if(_boost_STATIC_RUNTIME_WORKAROUND)
|
||||
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
|
||||
list(APPEND _boost_DEBUG_NAMES
|
||||
@@ -1001,6 +1030,13 @@
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
|
||||
+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
|
||||
+ list(APPEND _boost_DEBUG_NAMES
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
|
||||
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
|
||||
+ endif()
|
||||
endif()
|
||||
if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
|
||||
_Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
|
||||
@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.85-r1.ebuild,v 1.9 2012/03/25 15:01:01 armin76 Exp $
|
||||
|
||||
inherit perl-app
|
||||
|
||||
MY_PN="razor-agents"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
DESCRIPTION="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
|
||||
HOMEPAGE="http://razor.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
|
||||
LICENSE="Artistic"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-lang/perl"
|
||||
|
||||
RDEPEND="dev-perl/Net-DNS
|
||||
virtual/perl-net-ping
|
||||
virtual/perl-Time-HiRes
|
||||
|| ( virtual/perl-Digest-SHA dev-perl/Digest-SHA1 )
|
||||
dev-perl/URI
|
||||
dev-perl/Digest-Nilsimsa"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.85-use-sha-not-sha1.patch"
|
||||
"${FILESDIR}/${PN}-2.85-cosmetic-pv-fix.patch"
|
||||
)
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Run 'razor-admin -create' to create a default config file in your"
|
||||
elog "home directory under /home/user/.razor. (Remember to change user to"
|
||||
elog "your username from root before running razor-admin)"
|
||||
elog
|
||||
elog "Razor v2 requires reporters to be registered so their reputations can"
|
||||
elog "be computed over time and they can participate in the revocation"
|
||||
elog "mechanism. Registration is done with razor-admin -register. It has to be"
|
||||
elog "manually invoked in either of the following ways:"
|
||||
elog
|
||||
elog "To register user foo with 's1kr3t' as password: "
|
||||
elog
|
||||
elog "razor-admin -register -user=foo -pass=s1kr3t"
|
||||
elog
|
||||
elog "To register with an email address and have the password assigned:"
|
||||
elog
|
||||
elog "razor-admin -register -user=foo@bar.com "
|
||||
elog
|
||||
elog "To have both (random) username and password assgined: "
|
||||
elog
|
||||
elog "razor-admin -register "
|
||||
elog
|
||||
elog "razor-admin -register negotiates a registration with the Nomination Server"
|
||||
elog "and writes the identity information in"
|
||||
elog "/home/user/.razor/identity-username, or /etc/razor/identity-username"
|
||||
elog "when invoked as root."
|
||||
elog
|
||||
elog "You can edit razor-agent.conf to change the defaults. Config options"
|
||||
elog "and their values are defined in the razor-agent.conf(5) manpage."
|
||||
elog
|
||||
elog "The next step is to integrate razor-check, razor-report and"
|
||||
elog "razor-revoke in your mail system. If you are running Razor v1, the"
|
||||
elog "change will be transparent, new versions of razor agents will overwrite"
|
||||
elog "the old ones. You would still need to plugin razor-revoke in your MUA,"
|
||||
elog "since it's a new addition in Razor v2. If you are not running Razor v1,"
|
||||
elog "refer to manpages of razor-check(1), razor-report(1), and"
|
||||
elog "razor-revoke(1) for integration instructions."
|
||||
elog
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2.ebuild,v 1.8 2013/05/10 09:28:15 abcd Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
|
||||
it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian
|
||||
sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
|
||||
KDE_SCM="git"
|
||||
inherit kde4-base
|
||||
|
||||
DESCRIPTION="A media player for KDE with digital TV support"
|
||||
HOMEPAGE="http://kaffeine.kde.org/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.2"
|
||||
SLOT="4"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="
|
||||
x11-libs/libXScrnSaver
|
||||
dev-qt/qtsql:4[sqlite]
|
||||
>=media-libs/xine-lib-1.1.18.1
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( Changelog NOTES )
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_build debug DEBUG_MODULE)
|
||||
)
|
||||
|
||||
kde4-base_src_configure
|
||||
}
|
||||
@ -0,0 +1,163 @@
|
||||
Description: Fix compilation against libav10
|
||||
Patch based on work by Anton Khirnov, rebasing on mplayer2 revision
|
||||
2c378c7 allowed great simplification.
|
||||
Author: Reinhard Tartler <siretart@tauware.de>
|
||||
Origin: debian
|
||||
Bug-Debian: http://bugs.debian.org/739337
|
||||
Last-Update: 2014-03-08
|
||||
|
||||
--- mplayer2-2.0-728-g2c378c7.orig/Makefile
|
||||
+++ mplayer2-2.0-728-g2c378c7/Makefile
|
||||
@@ -301,7 +301,6 @@ SRCS_COMMON = asxparser.c \
|
||||
libmpcodecs/vf_ilpack.c \
|
||||
libmpcodecs/vf_ivtc.c \
|
||||
libmpcodecs/vf_kerndeint.c \
|
||||
- libmpcodecs/vf_lavc.c \
|
||||
libmpcodecs/vf_lavcdeint.c \
|
||||
libmpcodecs/vf_mirror.c \
|
||||
libmpcodecs/vf_noformat.c \
|
||||
--- mplayer2-2.0-728-g2c378c7.orig/screenshot.c
|
||||
+++ mplayer2-2.0-728-g2c378c7/screenshot.c
|
||||
@@ -82,6 +82,7 @@ static int write_png(screenshot_ctx *ctx
|
||||
FILE *fp = NULL;
|
||||
void *outbuffer = NULL;
|
||||
int success = 0;
|
||||
+ int got_output;
|
||||
|
||||
struct AVCodec *png_codec = avcodec_find_encoder(AV_CODEC_ID_PNG);
|
||||
AVCodecContext *avctx = NULL;
|
||||
@@ -104,10 +105,8 @@ static int write_png(screenshot_ctx *ctx
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
+ AVPacket pkt = { 0 };
|
||||
size_t outbuffer_size = image->width * image->height * 3 * 2;
|
||||
- outbuffer = malloc(outbuffer_size);
|
||||
- if (!outbuffer)
|
||||
- goto error_exit;
|
||||
|
||||
AVFrame *pic = ctx->pic;
|
||||
avcodec_get_frame_defaults(pic);
|
||||
@@ -115,8 +114,8 @@ static int write_png(screenshot_ctx *ctx
|
||||
pic->data[n] = image->planes[n];
|
||||
pic->linesize[n] = image->stride[n];
|
||||
}
|
||||
- int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, pic);
|
||||
- if (size < 1)
|
||||
+ int ret = avcodec_encode_video2(avctx, &pkt, pic, &got_output);
|
||||
+ if (ret < 0 || !got_output)
|
||||
goto error_exit;
|
||||
|
||||
fp = fopen(fname, "wb");
|
||||
@@ -126,8 +125,9 @@ static int write_png(screenshot_ctx *ctx
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
- fwrite(outbuffer, size, 1, fp);
|
||||
+ fwrite(pkt.data, pkt.size, 1, fp);
|
||||
fflush(fp);
|
||||
+ av_free_packet(&pkt);
|
||||
|
||||
if (ferror(fp))
|
||||
goto error_exit;
|
||||
@@ -139,7 +139,6 @@ error_exit:
|
||||
av_free(avctx);
|
||||
if (fp)
|
||||
fclose(fp);
|
||||
- free(outbuffer);
|
||||
return success;
|
||||
}
|
||||
|
||||
--- mplayer2-2.0-728-g2c378c7.orig/libmpcodecs/vf.c
|
||||
+++ mplayer2-2.0-728-g2c378c7/libmpcodecs/vf.c
|
||||
@@ -48,7 +48,7 @@ extern const vf_info_t vf_info_flip;
|
||||
extern const vf_info_t vf_info_rotate;
|
||||
extern const vf_info_t vf_info_mirror;
|
||||
extern const vf_info_t vf_info_palette;
|
||||
-extern const vf_info_t vf_info_lavc;
|
||||
+//extern const vf_info_t vf_info_lavc;
|
||||
extern const vf_info_t vf_info_dvbscale;
|
||||
extern const vf_info_t vf_info_cropdetect;
|
||||
extern const vf_info_t vf_info_test;
|
||||
@@ -131,7 +131,7 @@ static const vf_info_t *const filter_lis
|
||||
#ifdef CONFIG_LIBPOSTPROC
|
||||
&vf_info_pp,
|
||||
#endif
|
||||
- &vf_info_lavc,
|
||||
+ //&vf_info_lavc,
|
||||
&vf_info_lavcdeint,
|
||||
&vf_info_screenshot,
|
||||
&vf_info_fspp,
|
||||
--- mplayer2-2.0-728-g2c378c7.orig/libvo/vo_png.c
|
||||
+++ mplayer2-2.0-728-g2c378c7/libvo/vo_png.c
|
||||
@@ -52,8 +52,6 @@ static int z_compression;
|
||||
static int framenum;
|
||||
static int use_alpha;
|
||||
static AVCodecContext *avctx;
|
||||
-static uint8_t *outbuffer;
|
||||
-int outbuffer_size;
|
||||
|
||||
static int
|
||||
config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
|
||||
@@ -87,9 +85,10 @@ config(uint32_t width, uint32_t height,
|
||||
|
||||
|
||||
static uint32_t draw_image(mp_image_t* mpi){
|
||||
+ AVPacket pkt = { 0 };
|
||||
AVFrame pic;
|
||||
int buffersize;
|
||||
- int res;
|
||||
+ int res, got_output;
|
||||
char buf[100];
|
||||
FILE *outfile;
|
||||
|
||||
@@ -105,22 +104,18 @@ static uint32_t draw_image(mp_image_t* m
|
||||
|
||||
pic.data[0] = mpi->planes[0];
|
||||
pic.linesize[0] = mpi->stride[0];
|
||||
- buffersize = mpi->w * mpi->h * 8;
|
||||
- if (outbuffer_size < buffersize) {
|
||||
- av_freep(&outbuffer);
|
||||
- outbuffer = av_malloc(buffersize);
|
||||
- outbuffer_size = buffersize;
|
||||
- }
|
||||
- res = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic);
|
||||
|
||||
- if(res < 0){
|
||||
+ res = avcodec_encode_video2(avctx, &pkt, &pic, &got_output);
|
||||
+
|
||||
+ if(res < 0 || !got_output){
|
||||
mp_msg(MSGT_VO,MSGL_WARN, "[VO_PNG] Error in create_png.\n");
|
||||
fclose(outfile);
|
||||
return 1;
|
||||
}
|
||||
|
||||
- fwrite(outbuffer, res, 1, outfile);
|
||||
+ fwrite(pkt.data, pkt.size, 1, outfile);
|
||||
fclose(outfile);
|
||||
+ av_free_packet(&pkt);
|
||||
|
||||
return VO_TRUE;
|
||||
}
|
||||
@@ -157,8 +152,6 @@ static void uninit(void)
|
||||
if (avctx)
|
||||
avcodec_close(avctx);
|
||||
av_freep(&avctx);
|
||||
- av_freep(&outbuffer);
|
||||
- outbuffer_size = 0;
|
||||
}
|
||||
|
||||
static void check_events(void){}
|
||||
--- mplayer2-2.0-728-g2c378c7.orig/libmpdemux/demux_lavf.c
|
||||
+++ mplayer2-2.0-728-g2c378c7/libmpdemux/demux_lavf.c
|
||||
@@ -422,8 +422,8 @@ static void handle_stream(demuxer_t *dem
|
||||
* heuristic makes up works with subtitles in practice.
|
||||
*/
|
||||
double fps;
|
||||
- if (st->r_frame_rate.num)
|
||||
- fps = av_q2d(st->r_frame_rate);
|
||||
+ if (st->avg_frame_rate.num)
|
||||
+ fps = av_q2d(st->avg_frame_rate);
|
||||
else
|
||||
fps = 1.0 / FFMAX(av_q2d(st->time_base),
|
||||
av_q2d(st->codec->time_base) *
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue