root
8 years ago
parent
ae46ebf2de
commit
052f5a094b
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit eutils autotools
|
||||
|
||||
DEBIAN_PATCH="17"
|
||||
DESCRIPTION="FAM, the File Alteration Monitor"
|
||||
HOMEPAGE="http://oss.sgi.com/projects/fam/"
|
||||
SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
|
||||
mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="static-libs"
|
||||
|
||||
DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
|
||||
!app-admin/gamin"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
|
||||
edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
|
||||
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
|
||||
sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
|
||||
sed -i "${D}"/etc/fam.conf \
|
||||
-e "s:local_only = false:local_only = true:g" \
|
||||
|| die "sed fam.conf"
|
||||
|
||||
doinitd "${FILESDIR}/famd"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
fix out of tree builds
|
||||
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -7,7 +7,7 @@
|
||||
Client.h \
|
||||
fam.c++
|
||||
|
||||
-libfam_la_LDFLAGS = -export-symbols fam.sym
|
||||
+libfam_la_LDFLAGS = -export-symbols $(srcdir)/fam.sym
|
||||
libfam_la_LIBADD = -lstdc++
|
||||
|
||||
EXTRA_DIST = fam.sym
|
||||
@ -0,0 +1,15 @@
|
||||
https://bugs.gentoo.org/580702
|
||||
|
||||
fix build with newer glibc where sys/sysmacros.h isn't implicitly included
|
||||
by sys/types.h
|
||||
|
||||
--- a/src/DNotify.c++
|
||||
+++ b/src/DNotify.c++
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <libgen.h>
|
||||
@ -1,137 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
ROOT_PN="root"
|
||||
ROOFIT_DOC_PV=2.91-33
|
||||
ROOFIT_QS_DOC_PV=3.00
|
||||
TMVA_DOC_PV=4.2.0
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EVCS_OFFLINE=yes # we need exactly the same checkout as root itself
|
||||
EGIT_REPO_URI="http://root.cern.ch/git/root.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://root.cern.ch/download/${ROOT_PN}_v${PV}.source.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
S="${WORKDIR}/${ROOT_PN}"
|
||||
fi
|
||||
|
||||
inherit eutils multilib virtualx
|
||||
|
||||
DESCRIPTION="Documentation for ROOT Data Analysis Framework"
|
||||
HOMEPAGE="https://root.cern.ch"
|
||||
SRC_URI="${SRC_URI}
|
||||
math? (
|
||||
http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
|
||||
https://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
|
||||
http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf )
|
||||
api? (
|
||||
${HOMEPAGE}/sites/all/themes/newsflash/images/blue/root-banner.png
|
||||
${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="LGPL-2.1"
|
||||
IUSE="api +math +metric http"
|
||||
|
||||
VIRTUALX_REQUIRED="api"
|
||||
|
||||
DEPEND="
|
||||
app-text/pandoc
|
||||
dev-haskell/pandoc-citeproc[bibutils]
|
||||
dev-texlive/texlive-latex
|
||||
virtual/pkgconfig
|
||||
api? (
|
||||
media-fonts/dejavu
|
||||
~sci-physics/root-${PV}[X,graphviz,opengl]
|
||||
)"
|
||||
RDEPEND=""
|
||||
|
||||
DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
# we need to force sci-physics/root checkout here
|
||||
git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/${P}" "sci-physics/root/0"
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use api && epatch \
|
||||
"${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
|
||||
"${FILESDIR}/${PN}-6.00.01-fillpatterns.patch"
|
||||
# prefixify the configure script
|
||||
sed -i \
|
||||
-e "s:/usr:${EPREFIX}/usr:g" \
|
||||
configure || die "prefixify configure failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# we need only to setup paths here, html docs doesn't depend on USE flags
|
||||
if use api; then
|
||||
./configure \
|
||||
--prefix="${EPREFIX}/usr" \
|
||||
--etcdir="${EPREFIX}/etc/root" \
|
||||
--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
|
||||
--docdir="${EPREFIX}${DOC_DIR}" \
|
||||
--tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" \
|
||||
--testdir="${EPREFIX}${DOC_DIR}/examples/tests" \
|
||||
--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
|
||||
--with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
|
||||
--nohowto
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pdf_target=( primer users-guide )
|
||||
local pdf_size=pdfa4
|
||||
use metric || pdf_size=pdfletter
|
||||
use math && pdf_target+=( minuit2 spectrum )
|
||||
use http && pdf_target+=( HttpServer JSROOT )
|
||||
|
||||
local i
|
||||
for (( i=0; i<${#pdf_target[@]}; i++ )); do
|
||||
emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
|
||||
done
|
||||
|
||||
if use api; then
|
||||
# video drivers may want to access hardware devices
|
||||
cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
|
||||
[[ -n "${cards}" ]] && addpredict "${cards}"
|
||||
|
||||
ROOTSYS="${S}" Xemake html
|
||||
# if root.exe crashes, return code will be 0 due to gdb attach,
|
||||
# so we need to check if last html file was generated;
|
||||
# this check is volatile and can't catch crash on the last file.
|
||||
[[ -f htmldoc/timespec.html ]] || die "html doc generation crashed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${DOC_DIR}"
|
||||
|
||||
local i
|
||||
for (( i=0; i<${#pdf_target[@]}; i++ )); do
|
||||
doins documentation/"${pdf_target[i]}"/*.pdf
|
||||
done
|
||||
unset pdf_target
|
||||
|
||||
use math && doins \
|
||||
"${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \
|
||||
"${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \
|
||||
"${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf"
|
||||
|
||||
if use api; then
|
||||
# Install offline replacements for online messages
|
||||
cp "${DISTDIR}"/{root-banner.png,info.png} htmldoc/ || die "cp failed"
|
||||
# too large data to copy
|
||||
dodir "${DOC_DIR}/html"
|
||||
mv htmldoc/* "${ED}${DOC_DIR}/html/" || die
|
||||
docompress -x ${DOC_DIR}/html
|
||||
fi
|
||||
}
|
||||
@ -1,7 +1,10 @@
|
||||
DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
|
||||
DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
|
||||
DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c05f44fe1efdbf7eaa971a4bf234ea3bc95e244 SHA512 26be1b03af1ac0d6a413b0ab8a30d59c733d6d5c4e29ce3b5b90818a1589cbb5c46a50b9ee42b273ef3b37df8ff403241d68e1e2221ce969054fb7e5f13516ab WHIRLPOOL 52420897c49cd1bcfd8896df45a1f9c8df6337cb68dd7a6ff962361e7ab2eab1e6d6699ae8236b105e6b700b5d5b6c8da302ff477ac6493a60a665e4225cff02
|
||||
DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
|
||||
DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844
|
||||
DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
|
||||
DIST xen-gentoo-patches-7.tar.xz 24148 SHA256 859fb6b69125c0a1079b35a74bb004dce1b04827b05f056a746cc42c1b187557 SHA512 faf2b0ecd67d545366e2af7e7ecab5f808d02354d07f23cbffe1c3cb80dbb5f88cc4aa140d928ad269612e55c41740ff5bf2af3f0a1f16e375d404c3ffa712b1 WHIRLPOOL d75c35fa10dd1f1567a82c5d5cd7ddabc72def6d74ef7095b7bca9ce9adad2b6ff9c88b55bad7cdefe88da027e5c742f9b9dcafce457cf15f408ea35652546f6
|
||||
DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
|
||||
DIST xen-security-patches-17.tar.xz 9908 SHA256 9fc679ddea420e3aeb2f7ba4bacbb4c192b6c15d5e62b40def16cdb9e376a032 SHA512 4a5375caf5b928662b10c31ef5af2f9bd092b512d6fb1a0292b0389d3c7f5b062f7ed1401b6c5dbeb83d20418fd025bbca43e76d42c739c5a2809c6cfb59db16 WHIRLPOOL fdda75869ece47a180fce27b3d060b2dfe06861958443c55fe8de31f7c673382c468eccda0c40c87953abae57e12b2c3979a84515fb66ba190b6f7cffe57eb2d
|
||||
DIST xen-security-patches-18.tar.xz 2544 SHA256 99d7e0762d221f064d08ff4ca875b2270330a3924d5537b58505e72f8be0de04 SHA512 d2192a1f31557953118ad14e2ed2158577de529ea2cef9f63438f3bf570d979cea8b2f0244d8517a161878c6d8036173715228049102a85571e8dbc758eef3b9 WHIRLPOOL e67f77756fefa64b05c2621ab2e4bffaa349b8f6f7af2d0d7cade0516961e6789b4f6c30536bf681a86acbe907dcf29a08b0b573843fe07bcd7aa678ee7312b0
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c05f44fe1efdbf7eaa971a4bf234ea3bc95e244 SHA512 26be1b03af1ac0d6a413b0ab8a30d59c733d6d5c4e29ce3b5b90818a1589cbb5c46a50b9ee42b273ef3b37df8ff403241d68e1e2221ce969054fb7e5f13516ab WHIRLPOOL 52420897c49cd1bcfd8896df45a1f9c8df6337cb68dd7a6ff962361e7ab2eab1e6d6699ae8236b105e6b700b5d5b6c8da302ff477ac6493a60a665e4225cff02
|
||||
DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
|
||||
DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844
|
||||
DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
|
||||
DIST xen-security-patches-17.tar.xz 9908 SHA256 9fc679ddea420e3aeb2f7ba4bacbb4c192b6c15d5e62b40def16cdb9e376a032 SHA512 4a5375caf5b928662b10c31ef5af2f9bd092b512d6fb1a0292b0389d3c7f5b062f7ed1401b6c5dbeb83d20418fd025bbca43e76d42c739c5a2809c6cfb59db16 WHIRLPOOL fdda75869ece47a180fce27b3d060b2dfe06861958443c55fe8de31f7c673382c468eccda0c40c87953abae57e12b2c3979a84515fb66ba190b6f7cffe57eb2d
|
||||
DIST xen-security-patches-18.tar.xz 2544 SHA256 99d7e0762d221f064d08ff4ca875b2270330a3924d5537b58505e72f8be0de04 SHA512 d2192a1f31557953118ad14e2ed2158577de529ea2cef9f63438f3bf570d979cea8b2f0244d8517a161878c6d8036173715228049102a85571e8dbc758eef3b9 WHIRLPOOL e67f77756fefa64b05c2621ab2e4bffaa349b8f6f7af2d0d7cade0516961e6789b4f6c30536bf681a86acbe907dcf29a08b0b573843fe07bcd7aa678ee7312b0
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
MY_P="${PN}-${PV:0:3}-${PV:4}"
|
||||
DESCRIPTION="bash source code debugging"
|
||||
HOMEPAGE="http://bashdb.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86 ppc ppc64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
# Unfortunately, not all tests pass.
|
||||
RESTRICT='test'
|
||||
|
||||
src_prepare() {
|
||||
# We don't install this, so don't bother building it. #468044
|
||||
sed -i 's:texi2html:true:' doc/Makefile.in || die
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils webapp
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_PN="phpMyAdmin"
|
||||
MY_P="${MY_PN}-${MY_PV}-all-languages"
|
||||
|
||||
DESCRIPTION="Web-based administration for MySQL database in PHP"
|
||||
HOMEPAGE="https://www.phpmyadmin.net/"
|
||||
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="setup"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/php[crypt,ctype,filter,json,session,unicode]
|
||||
|| (
|
||||
dev-lang/php[mysqli]
|
||||
dev-lang/php[mysql]
|
||||
)
|
||||
virtual/httpd-php:*
|
||||
"
|
||||
|
||||
need_httpd_cgi
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
webapp_pkg_setup
|
||||
}
|
||||
|
||||
src_install() {
|
||||
webapp_src_preinst
|
||||
|
||||
dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
|
||||
rm -f LICENSE README* RELEASE-DATE-${MY_PV}
|
||||
|
||||
if ! use setup; then
|
||||
rm -rf setup || die "Cannot remove setup utility"
|
||||
elog "The phpMyAdmin setup utility has been removed."
|
||||
elog "It is a regular target of various exploits. If you need it, set USE=setup."
|
||||
else
|
||||
elog "You should consider disabling the setup USE flag"
|
||||
elog "to exclude the setup utility if you don't use it."
|
||||
elog "It regularly is the target of various exploits."
|
||||
fi
|
||||
|
||||
insinto "${MY_HTDOCSDIR#${EPREFIX}}"
|
||||
doins -r .
|
||||
|
||||
webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
|
||||
webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
|
||||
|
||||
webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
|
||||
webapp_src_install
|
||||
}
|
||||
@ -1,16 +1,16 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
PHP_EXT_NAME="sphinx"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
USE_PHP="php5-6"
|
||||
|
||||
inherit php-ext-pecl-r2
|
||||
inherit php-ext-pecl-r3
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
PHP_EXT_NAME="spl_types"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
PHP_EXT_PECL_PKG="SPL_Types"
|
||||
|
||||
USE_PHP="php5-6 php5-5 php5-4"
|
||||
USE_PHP="php5-6"
|
||||
|
||||
inherit php-ext-pecl-r2
|
||||
inherit php-ext-pecl-r3
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
@ -1,4 +1,2 @@
|
||||
DIST uncrustify-0.59.tar.gz 983822 SHA256 3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900 WHIRLPOOL 85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5
|
||||
DIST uncrustify-0.61.tar.gz 1143946 SHA256 1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9 SHA512 b6abd4ee2f22430c57cd47903674f0a5a37b86fe6604426248b24dda17f06fa2e6ca3877035874a31fa668fbf9c238f538813bcc7c1834bc349f94365714aedc WHIRLPOOL 1ad5dfc944910b6831f72f7be86b624273c44d535b359d13b017545c1259d3ed5d2eac7c2cb29f9abd2ecb24e26ea3b8cfd21c0454dd5562ac01a3274f104df7
|
||||
DIST uncrustify-0.62.tar.gz 1203764 SHA256 889a1544da42c861128153f2c006b9843065b6d11b63c834700eb489641e9ef3 SHA512 02ec50c8792eda4b9ca4fec92b64748fcaf3b5b7c0227df2b35aabb1c9a71f7cbb61037e31755c47939bd0268cfcd53be4f534fae0529ca72b675546b854bd87 WHIRLPOOL 46eb9d9faa4e4de7b0a741a20fe0ed60ee6ca20bd5f68b3f92e570e4e4bdcbbede0bc18d43d73cf3223c93cbcd931517725dae837d4f0003510cfd253b922903
|
||||
DIST uncrustify-0.63.tar.gz 1177106 SHA256 c78cc40d47af19ccac4590dd84eb129bed99c95a1f22a88371041abd9421ee24 SHA512 7ea0d059ab76b21675d1eef90aa9cadb0b2c288f29b67799dc50bf98065281b280022e2f29c4a69091131929319b919e9f8eb62aaf90e3bbf4868823db2f62a0 WHIRLPOOL 0df4fec34f88dbff5973131ef3fd73af1f60dc37cdd7141a3d28aeb04d793f32bfd4b6edbcabedc18bdc2fccdb8763da50195f457e9e9266b4e97e36ce237e95
|
||||
DIST uncrustify-0.64.tar.gz 1178957 SHA256 2a8cb3ab82ca53202d50fc2c2cec0edd11caa584def58d356c1c759b57db0b32 SHA512 bc7361520adc3c95c9ba3dffeabadec4219af1827ed2f4ae0c4ad94a0f366490854ed40d09ecc6bf3f34941bf87722f013e01d1a1684c9f7fb1adac6dd4fee01 WHIRLPOOL 1e45748b8dc3c2c99dd774677d539b4bd7e1f4f52c3e9a40894df3ab67780767604dd845e9ffc6f69eb23980e447ce8d82c526eba1236454194baac5f25d9a84
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV == *9999* ]]; then
|
||||
EGIT_REPO_URI="git://github.com/bengardner/uncrustify.git
|
||||
https://github.com/bengardner/uncrustify.git"
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
inherit git-r3
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit python-any-r1
|
||||
|
||||
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
|
||||
HOMEPAGE="http://uncrustify.sourceforge.net/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( ${PYTHON_DEPS} )"
|
||||
|
||||
python_test() {
|
||||
cd tests
|
||||
${EPYTHON} run_tests.py || die "tests failed"
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
|
||||
HOMEPAGE="http://uncrustify.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( =dev-lang/python-2* )"
|
||||
RDEPEND=""
|
||||
|
||||
src_test() {
|
||||
cd tests
|
||||
python2 run_tests.py || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Install failed"
|
||||
dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
if [[ $PV == *9999* ]]; then
|
||||
EGIT_REPO_URI="git://github.com/uncrustify/uncrustify.git
|
||||
https://github.com/uncrustify/uncrustify.git"
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
inherit git-r3 autotools
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
|
||||
SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz"
|
||||
S=${WORKDIR}/uncrustify-${P}
|
||||
fi
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit python-any-r1
|
||||
|
||||
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
|
||||
HOMEPAGE="http://uncrustify.sourceforge.net/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( ${PYTHON_DEPS} )"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
eautoreconf
|
||||
fi
|
||||
default
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd tests
|
||||
${EPYTHON} run_tests.py || die "tests failed"
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
|
||||
DIST darktable-2.0.6.tar.xz 3018300 SHA256 2368c1865221032061645342ba8c00bcd6d224e9829a55bc610e6cb67de738c1 SHA512 6ed9fe1d031bff7d27051111997b5da1cbebaef35ebfff42a3f0e2c8ca9ac6c46fc271d13468df7b2dd887553e06454ca24030d226a725f04f5b0b4635e62355 WHIRLPOOL d58dea18a3a75e16d8895b668a375d179ce6250cafeb399e89bb7f4baeeee25b8de2151d5eeed14030a8e154855b8d3d1e9789f33b9169b7905641858385cc4f
|
||||
DIST darktable-2.0.7.tar.xz 2960436 SHA256 a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab SHA512 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928 WHIRLPOOL 2d8df1d69c367df83d7933c2b4d6a904b4a56c5f13ca67820263669067ee938dbddb514129827abeec02fd01b82a23512d57e95461f6a44e5327516205dae3c4
|
||||
DIST darktable-2.2.0.rc2.tar.xz 3265220 SHA256 f3ed739f79858a1ce2b3746bbab11994f5fb38db6e96941d84ba475beab890a6 SHA512 359207ba75d5ddccd3e0d4f397c1b3374ef5f5be63fc0ea6a1c63f916fbffdb384e4c665bbb085d5b4fae644519c7a1c85d37290f6774113011aa21459918f5a WHIRLPOOL accadeddb32ab61a9952d0e72b7de9c3bd15c7bd569fbc417c03b2e6d92b098bf81516e991bb3201c77d55043f7ad5d1bd8d4836885872d9cead65e5ded70a43
|
||||
DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
|
||||
|
||||
@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
CMAKE_MIN_VERSION="3.0"
|
||||
|
||||
inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
|
||||
|
||||
DOC_PV="1.6.0"
|
||||
MY_PV="${PV/_/}"
|
||||
MY_P="${P/_/.}"
|
||||
|
||||
DESCRIPTION="A virtual lighttable and darkroom for photographers"
|
||||
HOMEPAGE="http://www.darktable.org/"
|
||||
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
|
||||
doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
|
||||
|
||||
LICENSE="GPL-3 CC-BY-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LANGS=" af ca cs da de el es fi fr gl he hu it ja nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN"
|
||||
# TODO add lua once dev-lang/lua-5.2 is unmasked
|
||||
IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
|
||||
nls opencl openmp openexr pax_kernel webp
|
||||
${LANGS// / l10n_}"
|
||||
|
||||
# sse3 support is required to build darktable
|
||||
REQUIRED_USE="cpu_flags_x86_sse3"
|
||||
|
||||
CDEPEND="
|
||||
dev-db/sqlite:3
|
||||
dev-libs/json-glib
|
||||
dev-libs/libxml2:2
|
||||
dev-libs/pugixml:0=
|
||||
gnome-base/librsvg:2
|
||||
>=media-gfx/exiv2-0.25-r2:0=[xmp]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/lensfun-0.2.3:0=
|
||||
media-libs/libpng:0=
|
||||
media-libs/tiff:0
|
||||
net-misc/curl
|
||||
virtual/jpeg:0
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
x11-libs/cairo
|
||||
>=x11-libs/gtk+-3.14:3
|
||||
x11-libs/pango
|
||||
colord? ( x11-libs/colord-gtk:0= )
|
||||
cups? ( net-print/cups )
|
||||
flickr? ( media-libs/flickcurl )
|
||||
geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
|
||||
gphoto2? ( media-libs/libgphoto2:= )
|
||||
graphicsmagick? ( media-gfx/graphicsmagick )
|
||||
jpeg2k? ( media-libs/openjpeg:0 )
|
||||
libsecret? (
|
||||
>=app-crypt/libsecret-0.18
|
||||
)
|
||||
opencl? ( virtual/opencl )
|
||||
openexr? ( media-libs/openexr:0= )
|
||||
webp? ( media-libs/libwebp:0= )"
|
||||
RDEPEND="${CDEPEND}
|
||||
kde? ( kde-apps/kwalletd:4 )"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
S="${WORKDIR}/${P/_/~}"
|
||||
|
||||
pkg_pretend() {
|
||||
if use openmp ; then
|
||||
tc-has-openmp || die "Please switch to an openmp compatible compiler"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use cpu_flags_x86_sse3 && append-flags -msse3
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_PRINT=$(usex cups)
|
||||
-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
|
||||
-DCUSTOM_CFLAGS=ON
|
||||
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
|
||||
-DUSE_COLORD=$(usex colord)
|
||||
-DUSE_FLICKR=$(usex flickr)
|
||||
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
|
||||
-DUSE_KWALLET=$(usex kde)
|
||||
-DUSE_LIBSECRET=$(usex libsecret)
|
||||
-DUSE_LUA=OFF
|
||||
-DUSE_MAP=$(usex geo)
|
||||
-DUSE_NLS=$(usex nls)
|
||||
-DUSE_OPENCL=$(usex opencl)
|
||||
-DUSE_OPENEXR=$(usex openexr)
|
||||
-DUSE_OPENJPEG=$(usex jpeg2k)
|
||||
-DUSE_OPENMP=$(usex openmp)
|
||||
-DUSE_WEBP=$(usex webp)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
|
||||
|
||||
for lang in ${LANGS} ; do
|
||||
use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
|
||||
done
|
||||
|
||||
if use pax_kernel && use opencl ; then
|
||||
pax-mark Cm "${ED}"/usr/bin/${PN} || die
|
||||
eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
|
||||
eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
|
||||
eqawarn "must be modified and this *may* lead to breakage! If"
|
||||
eqawarn "you suspect that ${PN} is broken by this modification,"
|
||||
eqawarn "please open a bug."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
elog "when updating from the currently stable 1.6 series,"
|
||||
elog "please bear in mind that your edits will be preserved during this process,"
|
||||
elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
|
||||
echo
|
||||
ewarn "It will not be possible to downgrade!"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
From 8b5e3cb38f46afd063a5258af0da1eb6a942dec5 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Campbell <ben@scumways.com>
|
||||
Date: Wed, 16 Nov 2016 14:41:05 +1300
|
||||
Subject: [PATCH] jp2: remove use of uchar define from older jasPer
|
||||
|
||||
fixes #41
|
||||
jasPer now defines jas_uchar instead of uchar, but it's a moot
|
||||
point since the offending code in DevIL was never executed and could
|
||||
be removed.
|
||||
---
|
||||
DevIL/src-IL/src/il_jp2.c | 42 ++++++++++++++----------------------------
|
||||
1 file changed, 14 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/src-IL/src/il_jp2.c b/src-IL/src/il_jp2.c
|
||||
index acc5787..3fd397b 100644
|
||||
--- a/src-IL/src/il_jp2.c
|
||||
+++ b/src-IL/src/il_jp2.c
|
||||
@@ -358,7 +358,7 @@ static jas_stream_ops_t jas_stream_devilops = {
|
||||
|
||||
static jas_stream_t *jas_stream_create(void);
|
||||
static void jas_stream_destroy(jas_stream_t *stream);
|
||||
-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, int bufsize);
|
||||
+static void jas_stream_initbuf(jas_stream_t *stream, int bufmode );
|
||||
|
||||
|
||||
// Modified version of jas_stream_fopen and jas_stream_memopen from jas_stream.c of JasPer
|
||||
@@ -377,7 +377,7 @@ jas_stream_t *iJp2ReadStream()
|
||||
stream->openmode_ = JAS_STREAM_READ | JAS_STREAM_BINARY;
|
||||
|
||||
/* We use buffering whether it is from memory or a file. */
|
||||
- jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
|
||||
+ jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
|
||||
|
||||
/* Select the operations for a memory stream. */
|
||||
stream->ops_ = &jas_stream_devilops;
|
||||
@@ -432,8 +432,7 @@ jas_stream_t *iJp2ReadStream()
|
||||
// The following functions are taken directly from jas_stream.c of JasPer,
|
||||
// since they are designed to be used within JasPer only.
|
||||
|
||||
-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
|
||||
- int bufsize)
|
||||
+static void jas_stream_initbuf(jas_stream_t *stream, int bufmode )
|
||||
{
|
||||
/* If this function is being called, the buffer should not have been
|
||||
initialized yet. */
|
||||
@@ -441,31 +440,18 @@ static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
|
||||
|
||||
if (bufmode != JAS_STREAM_UNBUF) {
|
||||
/* The full- or line-buffered mode is being employed. */
|
||||
- if (!buf) {
|
||||
- /* The caller has not specified a buffer to employ, so allocate
|
||||
- one. */
|
||||
- if ((stream->bufbase_ = jas_malloc(JAS_STREAM_BUFSIZE +
|
||||
- JAS_STREAM_MAXPUTBACK))) {
|
||||
- stream->bufmode_ |= JAS_STREAM_FREEBUF;
|
||||
- stream->bufsize_ = JAS_STREAM_BUFSIZE;
|
||||
- } else {
|
||||
- /* The buffer allocation has failed. Resort to unbuffered
|
||||
- operation. */
|
||||
- stream->bufbase_ = stream->tinybuf_;
|
||||
- stream->bufsize_ = 1;
|
||||
- }
|
||||
- } else {
|
||||
- /* The caller has specified a buffer to employ. */
|
||||
- /* The buffer must be large enough to accommodate maximum
|
||||
- putback. */
|
||||
- assert(bufsize > JAS_STREAM_MAXPUTBACK);
|
||||
- stream->bufbase_ = JAS_CAST(uchar *, buf);
|
||||
- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
|
||||
- }
|
||||
+ if ((stream->bufbase_ = jas_malloc(JAS_STREAM_BUFSIZE +
|
||||
+ JAS_STREAM_MAXPUTBACK))) {
|
||||
+ stream->bufmode_ |= JAS_STREAM_FREEBUF;
|
||||
+ stream->bufsize_ = JAS_STREAM_BUFSIZE;
|
||||
+ } else {
|
||||
+ /* The buffer allocation has failed. Resort to unbuffered
|
||||
+ operation. */
|
||||
+ stream->bufbase_ = stream->tinybuf_;
|
||||
+ stream->bufsize_ = 1;
|
||||
+ }
|
||||
} else {
|
||||
/* The unbuffered mode is being employed. */
|
||||
- /* A buffer should not have been supplied by the caller. */
|
||||
- assert(!buf);
|
||||
/* Use a trivial one-character buffer. */
|
||||
stream->bufbase_ = stream->tinybuf_;
|
||||
stream->bufsize_ = 1;
|
||||
@@ -527,7 +513,7 @@ jas_stream_t *iJp2WriteStream()
|
||||
stream->openmode_ = JAS_STREAM_WRITE | JAS_STREAM_BINARY;
|
||||
|
||||
/* We use buffering whether it is from memory or a file. */
|
||||
- jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
|
||||
+ jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);
|
||||
|
||||
/* Select the operations for a memory stream. */
|
||||
stream->ops_ = &jas_stream_devilops;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue