add/delete

This commit is contained in:
Mario Fetka 2011-11-19 16:55:48 +01:00
parent dec0c98298
commit e191b1ef58
55 changed files with 5731 additions and 172 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>apache</herd>
<herd>maintainer-wanted</herd>
</pkgmetadata>

View File

@ -0,0 +1,175 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
JAVA_PKG_IUSE="doc"
inherit java-pkg-2 eutils java-ant-2
MY_PV=${PV/_beta/-BETA}
DESCRIPTION="An extendible and configurable PDF manipulation layer library."
HOMEPAGE="http://www.sejda.org/"
SRC_URI="https://bitbucket.org/torakiki/sejda/get/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2.0"
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}/pdfsam"
COMMON_DEP="dev-java/dom4j:1
dev-java/log4j
dev-java/itext
dev-java/jaxen:1.1
dev-java/bcmail
dev-java/bcprov
dev-java/jgoodies-looks:2.0
dev-java/commons-lang:2.1
dev-java/iscwt
dev-java/isfreetype
dev-java/isnativec
dev-java/isrt
dev-java/jPod
dev-java/jPodRenderer
dev-java/sun-jai-bin
dev-java/jai-imageio
dev-java/jbig2
dev-java/jna
dev-java/swt:3.4
dev-java/ICEpdf
dev-java/batik:1.7"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
sys-devel/gettext
app-arch/unzip
${COMMON_DEP}"
src_unpack() {
unpack ${A} || die "unpack failed"
die
cp "${DISTDIR}"/icepdf*.zip "${WORKDIR}" || die "cp failed"
mkdir "${S}"
cd "${S}"
for zip in "${WORKDIR}"/*.zip
do
unpack ../work/${zip##*/} || die "unpacking ${zip} failed"
done
for bldprop in emp4j jcmdline pdfsam-maine pdfsam-console pdfsam-cover \
pdfsam-decrypt pdfsam-docinfo pdfsam-encrypt pdfsam-langpack \
pdfsam-merge pdfsam-mix pdfsam-rotate pdfsam-setviewer pdfsam-split \
pdfsam-unpack pdfsam-vcomposer pdfsam-vpagereorder jpodrenderercreator \
icepdfcreator
do
echo > ${S}/${bldprop}/ant/build.properties
echo "pdfsam.deploy.dir=${S}/deploy" >> ${S}/${bldprop}/ant/build.properties
echo "template.dir=${S}/template-enhanced-2" >> ${S}/${bldprop}/ant/build.properties
echo "workspace.dir=${S}" >> ${S}/${bldprop}/ant/build.properties
echo "build.dir=${S}/build" >> ${S}/${bldprop}/ant/build.properties
echo "libs.dir=${S}" >> ${S}/${bldprop}/ant/build.properties
echo "icepdf.libs.dir=${S}" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam.version=enhanced" >> ${S}/${bldprop}/ant/build.properties
echo "itext.jar.name=iText" >> ${S}/${bldprop}/ant/build.properties
echo "log4j.jar.name=log4j" >> ${S}/${bldprop}/ant/build.properties
echo "dom4j.jar.name=dom4j" >> ${S}/${bldprop}/ant/build.properties
echo "jaxen.jar.name=jaxen" >> ${S}/${bldprop}/ant/build.properties
echo "bcmail.jar.name=bcmail" >> ${S}/${bldprop}/ant/build.properties
echo "bcprov.jar.name=bcprov" >> ${S}/${bldprop}/ant/build.properties
echo "looks.jar.name=looks" >> ${S}/${bldprop}/ant/build.properties
echo "commons-lang.jar.name=commons-lang" >> ${S}/${bldprop}/ant/build.properties
echo "iscwt.jar.name=iscwt" >> ${S}/${bldprop}/ant/build.properties
echo "isfreetype.jar.name=isfreetype" >> ${S}/${bldprop}/ant/build.properties
echo "isnativec.jar.name=isnativec" >> ${S}/${bldprop}/ant/build.properties
echo "isrt.jar.name=isrt" >> ${S}/${bldprop}/ant/build.properties
echo "jPod.jar.name=jPod" >> ${S}/${bldprop}/ant/build.properties
echo "jPodFonts.jar.name=jPodFonts" >> ${S}/${bldprop}/ant/build.properties
echo "jPodRenderer.jar.name=jPodRenderer" >> ${S}/${bldprop}/ant/build.properties
echo "jai_codec.jar.name=jai_codec" >> ${S}/${bldprop}/ant/build.properties
echo "jai_core.jar.name=jai_core" >> ${S}/${bldprop}/ant/build.properties
echo "jai_imageio.jar.name=jai_imageio" >> ${S}/${bldprop}/ant/build.properties
echo "jcmdline.jar.name=pdfsam-jcmdline" >> ${S}/${bldprop}/ant/build.properties
echo "emp4j.jar.name=emp4j" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam.jar.name=pdfsam" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-console.jar.name=pdfsam-console" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-split.jar.name=pdfsam-split" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-merge.jar.name=pdfsam-merge" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-cover.jar.name=pdfsam-cover" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-encrypt.jar.name=pdfsam-encrypt" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-decrypt.jar.name=pdfsam-decrypt" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-mix.jar.name=pdfsam-mix" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-unpack.jar.name=pdfsam-unpack" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-langpack.jar.name=pdfsam-langpack" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-setviewer.jar.name=pdfsam-setviewer" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-vpagereorder.jar.name=pdfsam-vpagereorder" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-vcomposer.jar.name=pdfsam-vcomposer" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-docinfo.jar.name=pdfsam-docinfo" >> ${S}/${bldprop}/ant/build.properties
echo "pdfsam-rotate.jar.name=pdfsam-rotate" >> ${S}/${bldprop}/ant/build.properties
echo "jpodcreator.jar.name=jpodcreator" >> ${S}/${bldprop}/ant/build.properties
echo "icepdfcore.jar.name=icepdf-core" >> ${S}/${bldprop}/ant/build.properties
echo "icepdfcreator.jar.name=icepdfcreator" >> ${S}/${bldprop}/ant/build.properties
echo "batik-awt-util.jar.name=batik-awt-util" >> ${S}/${bldprop}/ant/build.properties
echo "batik-dom.jar.name=batik-dom" >> ${S}/${bldprop}/ant/build.properties
echo "batik-svg-dom.jar.name=batik-svg-dom" >> ${S}/${bldprop}/ant/build.properties
echo "batik-svggen.jar.name=batik-svggen" >> ${S}/${bldprop}/ant/build.properties
echo "batik-util.jar.name=batik-util" >> ${S}/${bldprop}/ant/build.properties
echo "batik-xml.jar.name=batik-xml" >> ${S}/${bldprop}/ant/build.properties
done
java-pkg_jarfrom itext
java-pkg_jarfrom dom4j-1
java-pkg_jarfrom log4j
java-pkg_jarfrom jaxen-1.1
java-pkg_jarfrom bcmail
java-pkg_jarfrom bcprov
java-pkg_jarfrom jgoodies-looks-2.0
java-pkg_jarfrom isrt
java-pkg_jarfrom isnativec
java-pkg_jarfrom isfreetype
java-pkg_jarfrom iscwt
java-pkg_jarfrom jPod
java-pkg_jarfrom jPodRenderer
java-pkg_jarfrom sun-jai-bin
java-pkg_jarfrom jai-imageio
java-pkg_jarfrom swt-3.4
java-pkg_jarfrom commons-lang-2.1
java-pkg_jarfrom batik-1.7
java-pkg_jarfrom ICEpdf
}
src_compile() {
eant -buildfile pdfsam-maine/ant/build.xml || die "build failed"
eant -buildfile icepdfcreator/ant/build.xml || die "build failed"
use doc && eant -buildfile pdfsam-maine/ant/build.xml javadoc
}
src_install() {
insinto /usr/share/${PN}-${SLOT}/lib
doins build/pdfsam-maine/release/dist/pdfsam-enhanced/*.xml || die "config install failed"
java-pkg_dojar build/pdfsam-maine/release/dist/pdfsam-enhanced/pdfsam.jar
java-pkg_dojar build/pdfsam-maine/release/dist/pdfsam-enhanced/lib/pdfsam-*.jar
java-pkg_dojar build/pdfsam-maine/release/dist/pdfsam-enhanced/lib/emp4j.jar
java-pkg_dojar build/pdfsam-maine/release/dist/pdfsam-enhanced/ext/jpodcreator.jar
java-pkg_dojar build/icepdfcreator/dist/icepdfcreator.jar
for plugins in cover decrypt docinfo encrypt merge mix rotate setviewer split unpack vcomposer vpagereorder
do
java-pkg_jarinto /usr/share/${PN}-${SLOT}/lib/plugins/${plugins}
insinto /usr/share/${PN}-${SLOT}/lib/plugins/${plugins}
java-pkg_dojar build/pdfsam-maine/release/dist/pdfsam-enhanced/plugins/${plugins}/*.jar
doins build/pdfsam-maine/release/dist/pdfsam-enhanced/plugins/${plugins}/*.xml || die "config install failed"
done
java-pkg_dolauncher ${PN}-${SLOT} --main org.pdfsam.guiclient.GuiClient --pwd "/usr/share/${PN}-${SLOT}/lib"
java-pkg_dolauncher ${PN}-console-${SLOT} --main org.pdfsam.console.ConsoleClient --pwd "/usr/share/${PN}-${SLOT}/lib"
newicon pdfsam-maine/images/pdf.png pdfsam-${SLOT}.png
make_desktop_entry ${PN} "PDF Split and Merge ${PV}" pdfsam-${SLOT} Office
use doc && dodoc pdfsam-maine/doc/enhanced/*
use doc && java-pkg_dojavadoc build/pdfsam-maine/apidocs
}

View File

@ -0,0 +1,2 @@
DIST devscripts_2.11.0.tar.gz 758806 RMD160 c60e01760a7a9d3341ff6659e77edbb2d07ce014 SHA1 f07f1f3aa6c78cae1098c76cbbe8b51113817f59 SHA256 4fbcff10e35da12f2efdbe82388566162c223abca7eba19d6d752440269c93ac
EBUILD deb-devscripts-2.11.0.ebuild 923 RMD160 7cd93eae53b691619ab0abb6bc929f55a397f4d3 SHA1 cef8dfb9f6667c754def5ebfb70c2bb9ad54d4a2 SHA256 915b6d3869bce66d906ec2070c4bdb84209257d657099ef2e406735338d480ec

View File

@ -0,0 +1,41 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
MY_PN="devscripts"
inherit eutils
DESCRIPTION="geos_one loved tools"
HOMEPAGE="http://linamh.disconnected-by-peer.at"
SRC_URI="http://ftp.disconnected-by-peer.at/go/${P}.tar.bz2"
SRC_URI_BASE="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/"
SRC_URI="${SRC_URI_BASE}${MY_PN}_${PV}.tar.gz"
SLOT="0"
LICENSE="GPL-2 GPL-3 BSD"
KEYWORDS="~amd64 ~arm ~x86"
RESTRICT="mirror"
IUSE=""
DEPEND=""
RDEPEND="dev-lang/ruby
virtual/perl-JSON-PP
app-arch/dpkg
app-text/docbook-xsl-stylesheets
app-portage/portage-utils"
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
sed -e "s!/stylesheet/xsl/nwalsh/!/xsl-ns-stylesheets/!g" \
-e "s!--install-layout=deb!!g" -i $(find -name Makefile)
}
src_install() {
emake DESTDIR="${D}" install || die "install fail"
dodoc README LICENSES AUTHORS
}

122
eclass/waf-utils.eclass Normal file
View File

@ -0,0 +1,122 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.5 2011/03/01 23:02:08 abcd Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
# gnome@gentoo.org
#
# @CODE
# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
# Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
# Proper prefix support: Jonathan Callen <abcd@gentoo.org>
# @CODE
# @BLURB: common ebuild functions for waf-based packages
# @DESCRIPTION:
# The waf-utils eclass contains functions that make creating ebuild for
# waf-based packages much easier.
# Its main features are support of common portage default settings.
inherit base eutils multilib
case ${EAPI:-0} in
4|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
# @FUNCTION: waf-utils_waflibdir
# @USAGE: [<waf-binary>]
# @DESCRIPTION:
# Echoes the absolute path to the directory containing the waf-based
# project's waflib python module. Ensures that the waflib shipped with a
# project is unpacked if it isn't already. This waflib may be safely
# patched because waf-lite will not touch the waflib directory if it
# already exists. Uses the waf binary specified in WAF_BINARY.
#
# @EXAMPLE
# The simplest case, for a monolithic compilation:
#
# @CODE
# pushd "$(waf-utils_waflibdir)" || die "Unable to patch waflib"
# epatch "${FILESDIR}"/${P}-waf-fix.patch
# popd
# @CODE
#
# Note that if you are using the python eclass and installating python
# modules, you must either call python_set_active_version or call
# waf-utils_waflibdir() from within a function run by
# python_execute(). This is because waf uses a different directory for
# waflib when using python3 than when using python2.
#
# @CODE
# SUPPORT_PYTHON_ABIS=1
# inherit eutils python waf-utils
#
# # Always use the waf associated with the current python ABI.
# WAF_BINARY=./waf
#
# src_prepare() {
# python_copy_sources
#
# myprepare() {
# epatch "${FILESDIR}"/${P}-sourcecode-fix.patch
#
# pushd "$(waf-utils_waflibdir)" || die "Unable to patch waflib"
# epatch "${FILESDIR}"/${P}-waf-fix.patch
# popd
# }
# python_execute_function -s myprepare
# }
# @CODE
waf-utils_waflibdir() {
debug-print-function ${FUNCNAME} "$@"
: ${WAF_BINARY:="${S}/waf"}
python -c "import imp, sys; sys.argv[0] = '${WAF_BINARY}'; waflite = imp.load_source('waflite', '${WAF_BINARY}'); print(waflite.find_lib());" \
|| die "Unable to locate or unpack waflib module from the waf script at ${WAF_BINARY}"
}
# @FUNCTION: waf-utils_src_configure
# @DESCRIPTION:
# General function for configuring with waf.
waf-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
# @ECLASS-VARIABLE: WAF_BINARY
# @DESCRIPTION:
# Eclass can use different waf executable. Usually it is located in "${S}/waf".
: ${WAF_BINARY:="${S}/waf"}
echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" \"${WAF_BINARY}\" --prefix=${EPREFIX}/usr --libdir=${EPREFIX}/usr/$(get_libdir) $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
"--prefix=${EPREFIX}/usr" \
"--libdir=${EPREFIX}/usr/$(get_libdir)" \
"$@" \
configure || die "configure failed"
}
# @FUNCTION: waf-utils_src_compile
# @DESCRIPTION:
# General function for compiling with waf.
waf-utils_src_compile() {
debug-print-function ${FUNCNAME} "$@"
local jobs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/--jobs=\2/" )
echo "\"${WAF_BINARY}\" build ${jobs}"
"${WAF_BINARY}" ${jobs} || die "build failed"
}
# @FUNCTION: waf-utils_src_install
# @DESCRIPTION:
# Function for installing the package.
waf-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
echo "\"${WAF_BINARY}\" --destdir=\"${D}\" install"
"${WAF_BINARY}" --destdir="${D}" install || die "Make install failed"
# Manual document installation
base_src_install_docs
}

View File

@ -1,4 +1,5 @@
AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
AUX xine-lib-ffmpeg-0.8.patch 4768 RMD160 fb71fda4ebdf3801ea5e480a570fb949596f4a6b SHA1 6a01a90da0079465d3f39b8c48cc875ef32184df SHA256 4d4da84a644dbdc22de2c778edddf19ad56d5c2647f3dbc6a4fc1fbdb6774da1
DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
EBUILD xine-lib-1.1.19-r1.ebuild 5656 RMD160 fc1de0bf387608f050ec2acc5c6a6a183ec3708f SHA1 d1ed0c60de50207147e97ff7a4920a1d652bb720 SHA256 7892e8fe1aca02f0edd4025df21464f4cf100f386c33ce453cee643aa1c8ab13

View File

@ -0,0 +1,101 @@
--- xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c.orig 2010-03-10 20:07:15.000000000 +0100
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c 2011-06-27 21:46:28.835606968 +0200
@@ -1055,12 +1055,16 @@ static void ff_handle_mpeg12_buffer (ff_
}
/* skip decoding b frames if too late */
- this->context->hurry_up = (this->skipframes > 0);
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
- len = avcodec_decode_video (this->context, this->av_frame,
- &got_picture, this->mpeg_parser->chunk_buffer,
- this->mpeg_parser->buffer_size);
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
+ avpkt.size = this->mpeg_parser->buffer_size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ len = avcodec_decode_video2 (this->context, this->av_frame,
+ &got_picture, &avpkt);
lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
len, got_picture);
len = current - buf->content - offset;
@@ -1112,7 +1116,7 @@ static void ff_handle_mpeg12_buffer (ff_
} else {
- if (this->context->hurry_up) {
+ if (this->context->skip_frame != AVDISCARD_DEFAULT) {
/* skipped frame, output a bad frame */
img = this->stream->video_out->get_frame (this->stream->video_out,
this->bih.biWidth,
@@ -1304,12 +1308,16 @@ static void ff_handle_buffer (ff_video_d
got_picture = 0;
} else {
/* skip decoding b frames if too late */
- this->context->hurry_up = (this->skipframes > 0);
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
lprintf("buffer size: %d\n", this->size);
- len = avcodec_decode_video (this->context, this->av_frame,
- &got_picture, &chunk_buf[offset],
- this->size);
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)&chunk_buf[offset];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ len = avcodec_decode_video2 (this->context, this->av_frame,
+ &got_picture, &avpkt);
#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* reset consumed pts value */
--- xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c.orig 2010-03-23 16:41:49.000000000 +0100
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c 2011-06-27 21:29:30.168906191 +0200
@@ -255,6 +255,7 @@ static void ff_audio_decode_data (audio_
buf->decoder_info[2]);
} else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
+ AVPacket avpkt;
if( !this->decoder_ok ) {
if ( ! this->context || ! this->codec ) {
@@ -286,11 +287,13 @@ static void ff_audio_decode_data (audio_
if (!this->output_open) {
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- avcodec_decode_audio2 (this->context,
- (int16_t *)this->decode_buffer,
- &decode_buffer_size,
- &this->buf[0],
- this->size);
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)&this->buf[0];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ avcodec_decode_audio3 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size, &avpkt);
this->audio_bits = this->context->bits_per_sample;
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
@@ -311,11 +314,13 @@ static void ff_audio_decode_data (audio_
offset = 0;
while (this->size>0) {
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- bytes_consumed = avcodec_decode_audio2 (this->context,
- (int16_t *)this->decode_buffer,
- &decode_buffer_size,
- &this->buf[offset],
- this->size);
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)&this->buf[offset];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ bytes_consumed = avcodec_decode_audio3 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size, &avpkt);
if (bytes_consumed<0) {
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,

View File

@ -0,0 +1,135 @@
# ChangeLog for media-sound/kradio
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.29 2011/10/28 23:34:35 abcd Exp $
28 Oct 2011; Jonathan Callen <abcd@gentoo.org> kradio-4.0.2.ebuild:
Bump to EAPI=4
01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> kradio-4.0.2.ebuild:
Rename USE="v4l2" to USE="v4l" wrt #385241
26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> kradio-4.0.2.ebuild:
Depend on virtual/ffmpeg instead of media-video/ffmpeg.
02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> kradio-4.0.2.ebuild:
EAPI3
*kradio-4.0.2 (09 Jan 2011)
09 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kradio-4.0.1.ebuild,
+kradio-4.0.2.ebuild:
Version bump. Drop old.
*kradio-4.0.1 (03 Oct 2010)
03 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kradio-4.0.0.ebuild,
+kradio-4.0.1.ebuild:
Version bump. Drop older.
16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> kradio-4.0.0.ebuild:
Fix building with FFmpeg >= 0.6 wrt #324279 by Alexis Ballier.
*kradio-4.0.0 (02 Jun 2009)
02 Jun 2009; Tomas Chvatal <scarabeus@gentoo.org>
-kradio-4.0.0_rc4.ebuild, +kradio-4.0.0.ebuild:
Version bump.
30 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
kradio-4.0.0_rc4.ebuild:
Adjust ffmpeg dep to allow correct versions.
*kradio-4.0.0_rc4 (30 May 2009)
30 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+kradio-4.0.0_rc4.ebuild, -kradio-20061112-r2.ebuild,
-files/kradio-20061112-desktop-file.diff,
-files/kradio-20061112-gcc43.patch:
Version bump. Per bug #259704. Remove old broken snapshot. Note this means
removal of kde3 version and adding kde4 one.
*kradio-20061112-r2 (13 Feb 2009)
13 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+files/kradio-20061112-desktop-file.diff, +kradio-20061112-r2.ebuild:
Get rid of invalid aRts dependency. Fix desktop file.
05 May 2008; Samuli Suominen <drac@gentoo.org>
+files/kradio-20061112-gcc43.patch, kradio-20061112-r1.ebuild:
Fix building with GCC 4.3 wrt #219875 by Martin Väth.
*kradio-20061112-r1 (30 Apr 2008)
30 Apr 2008; Patrick Kursawe <phosphan@gentoo.org>
+kradio-20061112-r1.ebuild:
Fixes according to bug #218527
30 Apr 2008; Patrick Kursawe <phosphan@gentoo.org>
-files/1.0b_beta3-includehints.patch, -kradio-1.0b_beta3.ebuild:
Removing obsolete versions. Leaving 0.3 here because of keywords missing in
later versions.
*kradio-20061112 (11 Feb 2008)
11 Feb 2008; Patrick Kursawe <phosphan@gentoo.org>
kradio-0.3.0_alpha20041207.ebuild, kradio-1.0b_beta3.ebuild,
+kradio-20061112.ebuild:
Version bump to latest available snapshot, see bug #154288
03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
Regenerate digest in Manifest2 format.
24 Apr 2006; Patrick Kursawe <phosphan@gentoo.org>
+files/1.0b_beta3-includehints.patch, kradio-1.0b_beta3.ebuild:
Added a patch for bug #129168 (Qt bug)
21 Nov 2005; Patrick Kursawe <phosphan@gentoo.org>
-kradio-1.0_beta1.ebuild, -kradio-1.0_beta3.ebuild,
kradio-1.0b_beta3.ebuild:
Hard-disabling lirc plugin when lirc not in USE (bug #111609)
Removing obsolete versions
*kradio-1.0b_beta3 (05 Sep 2005)
05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
+kradio-1.0b_beta3.ebuild:
Adding 1.0beta3b as 1.0b_beta3
*kradio-1.0_beta3 (26 Aug 2005)
26 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +kradio-1.0_beta3.ebuild:
Version bump - does no longer need unsermake, depends on arts if arts in USE
27 May 2005; Patrick Kursawe <phosphan@gentoo.org> kradio-1.0_beta1.ebuild:
Updating DEPEND/RDEPEND because of trouble with older unsermake versions
*kradio-1.0_beta1 (24 May 2005)
24 May 2005; Patrick Kursawe <phosphan@gentoo.org>
-kradio-0.3.0_alpha2.ebuild, +kradio-1.0_beta1.ebuild:
Version bump (bug #93682) - uses unsermake now, supports USE flags
arts, encode, ogg, vorbis.
*kradio-0.3.0_alpha20041207 (07 Dec 2004)
07 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
+files/0.3.0_alpha20041207-gcc.patch, +kradio-0.3.0_alpha20041207.ebuild:
Made CVS snapshot and a little patch to get it through gcc 3.4 (bug #73336)
22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
kradio-0.3.0_alpha2.ebuild:
Added to ~sparc.
29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kradio-0.3.0_alpha2.ebuild:
QA: inherit kde-base -> inherit kde, need-kde after R/DEPEND
07 Mar 2004; root <root@gentoo.org> kradio-0.3.0_alpha2.ebuild:
Added a dependency on libsndfile, see Bug #36595. Also make use of the
USE-Flag lirc and depend on it if needed.
*kradio-0.3.0_alpha2 (12 Dec 2003)
12 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
kradio-0.3.0_alpha2.ebuild, metadata.xml:
Initial import.

View File

@ -0,0 +1,5 @@
AUX kradio-4.0.2-ffmpeg08.patch 658 RMD160 d26b9bd24f93fd09b105b89160ba9498da5cf89e SHA1 91f9b1503554bf049617df0c86e40d3de328de0f SHA256 546d851168ec0d0c0a821cee9e3a926e0762efc548fb2b5b1ed142de13870ad9
DIST kradio4-4.0.2.tar.bz2 1604179 RMD160 2273737c772f47ed4c6124f9b9e994883b5124ae SHA1 d5ceac0e9260fc2fd1f4a0a567811b06edb0d175 SHA256 8d18fd2bac52133c712c0aef1dfd67ce503e0135860c248bdbe99c4b7ed97870
EBUILD kradio-4.0.2.ebuild 1190 RMD160 ff49ef31f1e4d4879172b62536bafcf11a132b68 SHA1 495f41d86e50a6d57f66fb28c4596b4539325236 SHA256 135a022cc4b32a1eda237f4166be92212b5ad309b197a7c1bdaa502f480cddc9
MISC ChangeLog 4784 RMD160 bf8d617692f60f3d299de22688750b32a90083aa SHA1 5f4c7cc6d313259760e3b1e5831d950ccce6f66e SHA256 f2c89aabd43e1098dd77f12b2c41d0e1e8308e3ec79fb4ec460092b5ea486b39
MISC metadata.xml 220 RMD160 a7adf69690c8573ceceff9b8efa22e074c1c2499 SHA1 41f9fb9f2920aa457ff68d560d1a1a3d90a09915 SHA256 b3e0af69cc34497798ede4df65665f7e1ef13913da5ade30ed744343152648da

View File

@ -0,0 +1,11 @@
--- plugins/internetradio/decoder_thread.cpp.ffmpeg 2011-06-26 02:14:41.000000000 +0200
+++ plugins/internetradio/decoder_thread.cpp 2011-06-26 02:14:55.000000000 +0200
@@ -535,7 +535,7 @@
m_av_audioStream = -1;
for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
// if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
- if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
+ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
m_av_audioStream = i;
}
}

View File

@ -0,0 +1,52 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.2.ebuild,v 1.5 2011/10/28 23:34:35 abcd Exp $
EAPI=4
KDE_LINGUAS="cs de es is pl pt pt_BR ru uk"
inherit kde4-base
MY_P=${PN}4-${PV/_/-}
DESCRIPTION="kradio is a radio tuner application for KDE"
HOMEPAGE="http://kradio.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l"
DEPEND="
media-libs/libsndfile
alsa? ( media-libs/alsa-lib )
lirc? ( app-misc/lirc )
mp3? ( media-sound/lame )
vorbis? (
media-libs/libvorbis
media-libs/libogg
)
ffmpeg? (
>=media-libs/libmms-0.4
virtual/ffmpeg
)
"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
PATCHES=( "${FILESDIR}/kradio-4.0.2-ffmpeg08.patch" )
src_configure() {
mycmakeargs=(
$(cmake-utils_use_with alsa ALSA)
$(cmake-utils_use_with mp3 LAME)
$(cmake-utils_use_with vorbis OGG_VORBIS)
$(cmake-utils_use_with lirc LIRC)
$(cmake-utils_use_with ffmpeg FFMPEG)
$(cmake-utils_use_with v4l V4L2)
)
kde4-base_src_configure
}

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
<maintainer>
<email>phosphan@gentoo.org</email>
</maintainer>
</pkgmetadata>

View File

@ -0,0 +1,14 @@
# ChangeLog for media-video/ushare
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.2 2009/12/29 05:21:57 darkside Exp $
29 Dec 2009; Jeremy Olexa <darkside@gentoo.org> ushare-1.1a.ebuild:
Fix building with USE=nls, bug 298207
*ushare-1.1a (23 Dec 2009)
23 Dec 2009; Jeremy Olexa <darkside@gentoo.org> +ushare-1.1a.ebuild,
+files/ushare.conf.d, +files/ushare.init.d, +metadata.xml:
Initial import. Many thanks to all the contributors on bug 192561. Moved
from sunrise overlay with modifications by myself

View File

@ -0,0 +1,7 @@
AUX ushare-mp4-support.patch 605 RMD160 cdb222cddb1b4916ec0f96ce00a3e1016f0855c8 SHA1 374a8c5792c54267c7ece9a420d5bed5306482cd SHA256 1cf93c0b988725be7b619e6148cafad1f17a3a632949aade7990818620549774
AUX ushare.conf.d 896 RMD160 8bf9d92633778a80a7492f8de120d03ca9d33a0d SHA1 d87f3bf5f813dc1a567d49c81809f57788b56036 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563
AUX ushare.init.d 2164 RMD160 adbee9c14af514ca8c91dfd0c9f37114828965ee SHA1 cde78bc810b58a2e1d7c2564750f38f81d325fb4 SHA256 7a8c4c06aacf9a87ae2036df24751a74a29e741a39e89e0c704c63a27ad2a4c2
DIST ushare-1.1a.tar.bz2 65864 RMD160 6194ffec031d20fd897f2c7cf71c3c810238713f SHA1 1539e83cde5d80f433d262d971f5fe78486c9375 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
EBUILD ushare-1.1a.ebuild 1572 RMD160 2f4cf570df69ffa2998e12da579549f5f8d23078 SHA1 c11420c2a3428c58a28ccfe1e1296125bf96d8a0 SHA256 a981e6df7e9699ca67cc56b9cd62d82e612f2b9dad2aad0f05a26e507c6148bb
MISC ChangeLog 610 RMD160 62969eca5434acea74b94f9f7100405cab9ccb16 SHA1 7435dea800f3809c5386310195c46870ce0f8735 SHA256 e7ddbcc4af37bdb8ebc0226ca57fbffd911e8e620335f711925d643c8394d35f
MISC metadata.xml 325 RMD160 c13b582c543062bebe26ba528099f118a89bdd23 SHA1 166336d7ee3f81fe2be6ac0c265d2903c070f3cb SHA256 24b9cc6b2e1e3c8011e0133aea0e8156bfdf6896f42bac864d444672bc6c9ad3

View File

@ -0,0 +1,13 @@
diff -crB ushare-1.1a-orig/src/mime.c ushare-1.1a/src/mime.c
*** ushare-1.1a-orig/src/mime.c Mon Oct 25 13:21:01 2010
--- ushare-1.1a/src/mime.c Mon Oct 25 13:21:45 2010
***************
*** 53,58 ****
--- 53,59 ----
{ "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
{ "m4v", UPNP_VIDEO, "http-get:*:video/mp4:"},
{ "m4p", UPNP_VIDEO, "http-get:*:video/mp4:"},
+ { "mp4", UPNP_VIDEO, "http-get:*:video/mp4:"},
{ "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"},
{ "ts", UPNP_VIDEO, "http-get:*:video/mpeg2:"},
{ "ogm", UPNP_VIDEO, "http-get:*:video/mpeg:"},

View File

@ -0,0 +1,38 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/files/ushare.conf.d,v 1.1 2009/12/23 22:27:37 darkside Exp $
# User to run ushare daemon (if none, root will be used)
USHARE_USER="ushare"
# UPNP Friendly Name:
USHARE_NAME="uShare"
# The interface to bind to:
USHARE_IFACE="eth0"
# Static ushare port:
USHARE_PORT=""
# Enable/Disable telnet:
USHARE_TELNET="yes"
# Choose different telnet port:
USHARE_TELNET_PORT=""
# Enable/Disable web component:
USHARE_WEB="yes"
# A List of directories to share, each precieded by '-c':
USHARE_DIRS=""
# Enable/Disable XboX 360 compliant profile:
USHARE_XBOX="no"
# Enable/Disable DLNA compliant profile (Playstation3 requires this):
USHARE_DLNA="no"
# Misc. options:
USHARE_OPTS=""
# Check ushare --help or man ushare for more options.

View File

@ -0,0 +1,79 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/files/ushare.init.d,v 1.1 2009/12/23 22:27:37 darkside Exp $
depend() {
use net
}
start() {
ebegin "Starting uShare"
# Sanity check to avoid ushare failling on booting with no
# shared dirs
if [[ -z "${USHARE_DIRS}" ]] ; then
eerror "Please set shared dirs in /etc/conf.d/ushare"
return 1
fi
if [[ -z "${USHARE_PORT}" ]] ; then
einfo "${USHARE_NAME} runs on a dynamic port"
local ushare_port=
else
local ushare_port="--port ${USHARE_PORT}"
einfo "${USHARE_NAME} using port ${USHARE_PORT}"
fi
if [[ "${USHARE_TELNET}" == "yes" ]] ; then
local ushare_telnet=
else
local ushare_telnet="--no-telnet"
fi
if [[ -z "${ushare_telnet}" ]] ; then
if [[ -z "${USHARE_TELNET_PORT}" ]] ; then
local ushare_telnet_port=
einfo "${USHARE_NAME} runs telnet on the default port"
else
local ushare_telnet_port="--telnet-port ${USHARE_TELNET_PORT}"
einfo "${USHARE_NAME} runs telnet on port ${USHARE_TELNET_PORT}"
fi
else
local ushare_telnet_port=
fi
if [[ "${USHARE_WEB}" == "yes" ]] ; then
local ushare_web=
else
local ushare_web="--no-web"
fi
if [[ "${USHARE_XBOX}" == "yes" ]] ; then
local ushare_xbox="--xbox"
else
local ushare_xbox=
fi
if [[ "${USHARE_DLNA}" == "yes" ]] ; then
local ushare_dlna="--dlna"
else
local ushare_dlna=
fi
start-stop-daemon --start --quiet -c ${USHARE_USER:-root} \
--exec /usr/bin/ushare -- -D -i ${USHARE_IFACE} \
-n ${USHARE_NAME} ${USHARE_OPTS} ${USHARE_DIRS} \
${ushare_port} \
${ushare_telnet} ${ushare_telnet_port} \
${ushare_web} \
${ushare_xbox} \
${ushare_dlna}
eend $?
}
stop() {
ebegin "Stopping uShare"
start-stop-daemon --stop --quiet --exec /usr/bin/ushare
eend $?
}

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>video</herd>
<maintainer>
<email>darkside@gentoo.org</email>
</maintainer>
<use>
<flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,59 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.2 2009/12/29 05:21:57 darkside Exp $
inherit eutils
EAPI="2"
DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
HOMEPAGE="http://ushare.geexbox.org/"
SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dlna nls"
RDEPEND="net-libs/libupnp
dlna? ( media-libs/libdlna )"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
src_prepare() {
epatch "${FILESDIR}/ushare-mp4-support.patch"
elog "Replacing Original init.d File"
sed -i \
-e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \
-e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \
scripts/Makefile || die
}
src_configure() {
local myconf
myconf="--prefix=/usr --sysconfdir=/etc --disable-strip $(use_enable dlna)"
# nls can only be disabled, on by default.
use nls || myconf="${myconf} --disable-nls"
./configure ${myconf} || die "Configure failed"
}
src_compile() {
emake || die "Make failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
doman src/ushare.1 || die
newconfd "${FILESDIR}"/ushare.conf.d ushare || die
newinitd "${FILESDIR}"/ushare.init.d ushare || die
dodoc NEWS README TODO THANKS AUTHORS || die
}
pkg_postinst() {
enewuser ushare
elog "Please edit /etc/conf.d/ushare to set the shared directories"
elog "and other important settings. Check system log if ushare is"
elog "not booting."
}

View File

@ -0,0 +1,109 @@
# ChangeLog for net-misc/mediatomb
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.23 2011/11/17 03:40:31 axs Exp $
17 Nov 2011; Ian Stakenvicius <axs@gentoo.org> mediatomb-0.12.1.ebuild,
+files/mediatomb-0.12.1-mozjs185.patch:
in-place update to support dev-lang/spidermonkey-1.8.5 for bug 376993
04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mediatomb-0.12.1.ebuild:
Move to virtual/ffmpeg from media-video/ffmpeg.
26 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
mediatomb-0.12.1.ebuild:
Marked ~ppc wrt #342065. Thanks to f.mensik <f.mensik@tiscali.cz> for
report and testing.
21 Feb 2011; Jeremy Olexa <darkside@gentoo.org> mediatomb-0.12.1.ebuild,
+files/mediatomb-0.12.1-gcc46.patch:
Add patch for gcc-4.6, bug 353733 by Ryan Hill
08 Oct 2010; Jeremy Olexa <darkside@gentoo.org>
-files/mediatomb-0.11.0+curl-7.18.patch,
-files/mediatomb-0.11.0+glibc-2.10.patch,
-files/mediatomb-0.11.0-newffmpeg.patch, -files/mediatomb-0.11.0.config:
unused
19 Aug 2010; Jeremy Olexa <darkside@gentoo.org> -mediatomb-0.11.0.ebuild,
-mediatomb-0.12.0-r1.ebuild, files/mediatomb-0.12.0.confd,
-files/mediatomb.confd, -files/mediatomb.initd:
Add helper comment to confd file for bug 274627, comment #4 by Andrew
Frink. Old cruft cleanup
18 Apr 2010; Markus Meier <maekke@gentoo.org> mediatomb-0.12.1.ebuild:
amd64 stable, bug #284886
16 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
mediatomb-0.12.1.ebuild:
stable x86, security bug 284886
15 Apr 2010; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
Change maintainer to myself
*mediatomb-0.12.1 (08 Apr 2010)
08 Apr 2010; Jeremy Olexa <darkside@gentoo.org> +mediatomb-0.12.1.ebuild:
Version bump to fix YouTube issues and other small bug fixes. Re-introduce
USE=libextractor for bug 312855
04 Apr 2010; Jeremy Olexa <darkside@gentoo.org>
mediatomb-0.12.0-r1.ebuild:
Add ~arm, tested on armv7 platform
*mediatomb-0.12.0-r1 (30 Mar 2010)
30 Mar 2010; Jeremy Olexa <darkside@gentoo.org> -mediatomb-0.12.0.ebuild,
+mediatomb-0.12.0-r1.ebuild, +files/mediatomb-0.12.0.confd,
+files/mediatomb-0.12.0.initd:
minor revbump to grab new init/conf files from bug 264235 that I forgot
29 Mar 2010; Jeremy Olexa <darkside@gentoo.org> +mediatomb-0.12.0.ebuild,
+files/mediatomb-0.12.0.config, metadata.xml:
The long awaited mediatomb version bump. Closes bugs: 274627, 284886,
281432 - including security bug. Many thanks to BT for the help and
motivation
*mediatomb-0.12.0 (29 Mar 2010)
29 Mar 2010; Jeremy Olexa <darkside@gentoo.org> +mediatomb-0.12.0.ebuild,
+files/mediatomb-0.12.0.config:
The long awaited mediatomb version bump from upstream, closes bug 264235.
Many thanks to BT for the help
29 Dec 2009; Raúl Porcel <armin76@gentoo.org> mediatomb-0.11.0.ebuild:
Add ~arm
22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
mediatomb-0.11.0.ebuild:
Remove USE expat wrt #297864.
22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
mediatomb-0.11.0.ebuild, +files/mediatomb-0.11.0+glibc-2.10.patch:
Add patch to build with glibc-2.10, closes bug #270715.
25 Oct 2008; Pieter Van den Abeele <pvdabeel@gentoo.org> mediatomb-0.11.0.ebuild:
keyworded ~ppc. Closes bug #219420
08 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> mediatomb-0.11.0.ebuild:
amd64 stable, bug #224287
05 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
mediatomb-0.11.0.ebuild:
stable x86, bug 224287
26 Apr 2008; Markus Meier <maekke@gentoo.org> mediatomb-0.11.0.ebuild:
add ~x86, bug #217747
21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+files/mediatomb-0.11.0+curl-7.18.patch, mediatomb-0.11.0.ebuild:
Add patch to fix building with curl 7.18, thanks to Łukasz Dudek.
*mediatomb-0.11.0 (27 Mar 2008)
27 Mar 2008; Diego Pettenò <flameeyes@gentoo.org>
+files/mediatomb-0.11.0-newffmpeg.patch, +files/mediatomb-0.11.0.config,
+files/mediatomb.confd, +files/mediatomb.initd, +metadata.xml,
+mediatomb-0.11.0.ebuild:
Initial import of mediatomb, an UPnP media server compatible with Sony
PlayStation 3. Thanks to BT in bug #172799 for the ebuild.

View File

@ -0,0 +1,10 @@
AUX 030-libav-0.7-support.patch 1982 RMD160 9161aa49a2a32f22035358838c10b22b9cd70c56 SHA1 3a23415e482e33b6a31cc90fd90c65663b40b7a2 SHA256 7ead2970330c8ab3056ecf9abda09cb4e13cf7a72f51c2145c49af4b08128a18
AUX mediatomb-0.12.0.confd 805 RMD160 80b99ac5eb0a3cfdbe658084b6ba8a48c2b97dea SHA1 c3908aa800c4d6f3078760b5c32fbdf745f28239 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c
AUX mediatomb-0.12.0.config 6180 RMD160 ee51ad90cd9c4107376b80af19dfe076f06df8e7 SHA1 41376b8a161d8523846c5adb5375af5bc0c1a0d1 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2
AUX mediatomb-0.12.0.initd 541 RMD160 cb4ccfebbe98d38a9e4fdedc6f0fa9aa7ab18453 SHA1 e3c8ed51e118cc72a164b908fe4d629a1ebbf14b SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696
AUX mediatomb-0.12.1-gcc46.patch 297 RMD160 b0de22743402e27bffd8a868026f0003f9960b24 SHA1 db58b48202b3e2d2dee42b13f761994ed4e67796 SHA256 58379e733518bc5ef61fee9156d430ef283278eb3a69f6bdad4cad794df75146
AUX mediatomb-0.12.1-mozjs185.patch 22839 RMD160 6e47aff3a3d97d7d8a5359161b549699368a6bb8 SHA1 95d47ffd95b217100387844cbbbd854d0587f8dd SHA256 3960961f1fbe46baff3956ea2fa94b4dc193c0d278b8646cda1f4cee26812f59
DIST mediatomb-0.12.1.tar.gz 1240612 RMD160 ecb61ca2483f76421beef1036ac442b8f805fa96 SHA1 86e880584cc9c8aaf3926d56048510d1d06e76b4 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
EBUILD mediatomb-0.12.1.ebuild 3796 RMD160 f8cb5715acfad6aae388effcb8e885cf17d8d563 SHA1 2da765acd9a59dcff3011810f40156ea4d821dc5 SHA256 01be7e8c89a7e6761464a9f7da45f52b6d2e5f8c7ba2d9546b621e8d3984bd8c
MISC ChangeLog 4241 RMD160 2137dfe3d81fe8edcb81d2d53df4523670fc41fa SHA1 5eac9e9b36ea9d8d06521a7e6efe64032b42c35d SHA256 26e541b45192b2c47cbb338f5e025596d5cdc2ba9d7115220d98df0e44fe48a0
MISC metadata.xml 917 RMD160 2c817f4ed63ff24ff4262df5897733098ab753f9 SHA1 1eb716452e1ead4a6fb2cf4931f76d2dc9df6cd9 SHA256 a8f81f44d0efc27bd22ebefe96864f84c94c1cadb1908ff1ed52fd3d91b99e23

View File

@ -0,0 +1,63 @@
=== modified file 'src/metadata/ffmpeg_handler.cc'
--- old/src/metadata/ffmpeg_handler.cc 2010-08-25 17:07:03 +0000
+++ new/src/metadata/ffmpeg_handler.cc 2011-05-19 04:33:32 +0000
@@ -89,6 +89,33 @@
Ref<StringConverter> sc = StringConverter::m2i();
+ /* Tabs are 4 characters here */
+ typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
+ static const mapping_t mapping[] =
+ {
+ {"title", M_TITLE},
+ {"artist", M_ARTIST},
+ {"album", M_ALBUM},
+ {"date", M_DATE},
+ {"genre", M_GENRE},
+ {"comment", M_DESCRIPTION},
+ {"track", M_TRACKNUMBER},
+ {NULL, M_MAX},
+ };
+
+ if (!pFormatCtx->metadata)
+ return;
+ for (const mapping_t *m = mapping; m->avname != NULL; m++)
+ {
+ AVMetadataTag *tag = NULL;
+ tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
+ if (tag && tag->value && tag->value[0])
+ {
+ log_debug("Added metadata %s: %s\n", m->avname, tag->value);
+ item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
+ }
+ }
+ /* Old algorithm (doesn't work with libav >= 0.7)
if (strlen(pFormatCtx->title) > 0)
{
log_debug("Added metadata title: %s\n", pFormatCtx->title);
@@ -131,6 +158,7 @@
item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp,
sc->convert(String::from(pFormatCtx->track)));
}
+ */
}
// ffmpeg library calls
@@ -178,7 +206,7 @@
for(i=0; i<pFormatCtx->nb_streams; i++)
{
AVStream *st = pFormatCtx->streams[i];
- if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
+ if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
{
if (st->codec->codec_tag > 0)
{
@@ -209,7 +237,7 @@
*y = st->codec->height;
}
}
- if(st->codec->codec_type == CODEC_TYPE_AUDIO)
+ if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
{
// Increase number of audiochannels
audioch++;

View File

@ -0,0 +1,28 @@
# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
# See the mediatomb(1) manpage for more info.
# MediaTomb Web UI port.
# NOTE: The minimum value allowed is 49152
MEDIATOMB_PORT=49152
# Run MediaTomb as this user.
# NOTE: For security reasons do not run MediaTomb as root.
MEDIATOMB_USER="mediatomb"
# Run MediaTomb as this group.
# NOTE: For security reasons do not run MediaTomb as root.
MEDIATOMB_GROUP="mediatomb"
# Path to MediaTomb config file.
MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
# Path to MediaTomb log file.
MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
# Path to MediaTomb pid file.
MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
# Other options you want to pass to MediaTomb.
# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
MEDIATOMB_OPTIONS=""

View File

@ -0,0 +1,144 @@
<?xml version="1.0" encoding="UTF-8"?>
<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
<server>
<ui enabled="yes" show-tooltips="yes">
<accounts enabled="no" session-timeout="30">
<account user="mediatomb" password="mediatomb"/>
</accounts>
</ui>
<name>MediaTomb</name>
<udn></udn>
<home>/var/lib/mediatomb</home>
<webroot>/usr/share/mediatomb/web</webroot>
<storage>
<sqlite3 enabled="yes">
<database-file>mediatomb.db</database-file>
</sqlite3>
<mysql enabled="no">
<host>host</host>
<database>database</database>
<username>username</username>
<password>password</password>
</mysql>
</storage>
<protocolInfo extend="yes"/>
<pc-directory upnp-hide="no"/>
<extended-runtime-options>
<ffmpegthumbnailer enabled="no">
<thumbnail-size>160</thumbnail-size>
<seek-percentage>10</seek-percentage>
<filmstrip-overlay>no</filmstrip-overlay>
<workaround-bugs>no</workaround-bugs>
<image-quality>8</image-quality>
</ffmpegthumbnailer>
<mark-played-items enabled="no" suppress-cds-updates="yes">
<string mode="prepend">*</string>
<mark>
<content>video</content>
</mark>
</mark-played-items>
<lastfm enabled="no">
<username>username</username>
<password>password</password>
</lastfm>
</extended-runtime-options>
</server>
<import hidden-files="no">
<scripting script-charset="UTF-8">
<common-script>/usr/share/mediatomb/js/common.js</common-script>
<playlist-script>/usr/share/mediatomb/js/playlists.js</playlist-script>
<virtual-layout type="builtin">
<import-script>/usr/share/mediatomb/js/import.js</import-script>
</virtual-layout>
</scripting>
<mappings>
<extension-mimetype ignore-unknown="no">
<map from="mp3" to="audio/mpeg"/>
<map from="ogx" to="application/ogg"/>
<map from="ogv" to="video/ogg"/>
<map from="oga" to="audio/ogg"/>
<map from="ogg" to="audio/ogg"/>
<map from="ogm" to="video/ogg"/>
<map from="asf" to="video/x-ms-asf"/>
<map from="asx" to="video/x-ms-asf"/>
<map from="wma" to="audio/x-ms-wma"/>
<map from="wax" to="audio/x-ms-wax"/>
<map from="wmv" to="video/x-ms-wmv"/>
<map from="wvx" to="video/x-ms-wvx"/>
<map from="wm" to="video/x-ms-wm"/>
<map from="wmx" to="video/x-ms-wmx"/>
<map from="m3u" to="audio/x-mpegurl"/>
<map from="pls" to="audio/x-scpls"/>
<map from="flv" to="video/x-flv"/>
<map from="mkv" to="video/x-matroska"/>
<map from="mka" to="audio/x-matroska"/>
<map from="avi" to="video/divx"/>
<map from="m2ts" to="video/avc"/>
<map from="cr2" to="image/raw"/>
<map from="nef" to="image/raw"/>
</extension-mimetype>
<mimetype-upnpclass>
<map from="audio/*" to="object.item.audioItem.musicTrack"/>
<map from="video/*" to="object.item.videoItem"/>
<map from="image/*" to="object.item.imageItem"/>
</mimetype-upnpclass>
<mimetype-contenttype>
<treat mimetype="audio/mpeg" as="mp3"/>
<treat mimetype="application/ogg" as="ogg"/>
<treat mimetype="video/ogg" as="ogg"/>
<treat mimetype="audio/ogg" as="ogg"/>
<treat mimetype="audio/x-flac" as="flac"/>
<treat mimetype="image/jpeg" as="jpg"/>
<treat mimetype="audio/x-mpegurl" as="playlist"/>
<treat mimetype="audio/x-scpls" as="playlist"/>
<treat mimetype="audio/x-wav" as="pcm"/>
<treat mimetype="audio/L16" as="pcm"/>
<treat mimetype="video/x-msvideo" as="avi"/>
<treat mimetype="video/mp4" as="mp4"/>
<treat mimetype="audio/mp4" as="mp4"/>
<treat mimetype="video/divx" as="avi"/>
</mimetype-contenttype>
</mappings>
<online-content>
<YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
<favorites user="NationalGeographic"/>
<playlists user="PlayStation"/>
<uploads user="Google"/>
<standardfeed feed="most_viewed" time-range="today"/>
<standardfeed feed="recently_featured" time-range="today"/>
</YouTube>
</online-content>
</import>
<transcoding enabled="no">
<mimetype-profile-mappings>
<transcode mimetype="audio/ogg" using="audio2pcm"/>
<transcode mimetype="audio/x-flac" using="audio2pcm"/>
<transcode mimetype="video/ogg" using="video2mpeg"/>
<transcode mimetype="video/x-flv" using="video2mpeg"/>
</mimetype-profile-mappings>
<profiles>
<profile name="audio2pcm" enabled="yes" type="external">
<mimetype>audio/L16</mimetype>
<accept-url>no</accept-url>
<first-resource>yes</first-resource>
<hide-original-resource>yes</hide-original-resource>
<accept-ogg-theora>no</accept-ogg-theora>
<sample-frequency>44100</sample-frequency>
<audio-channels>2</audio-channels>
<agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
<buffer size="1048576" chunk-size="131072" fill-size="262144"/>
</profile>
<profile name="video2mpeg" enabled="yes" type="external">
<mimetype>video/mpeg</mimetype>
<accept-url>no</accept-url>
<first-resource>yes</first-resource>
<hide-original-resource>yes</hide-original-resource>
<accept-ogg-theora>yes</accept-ogg-theora>
<sample-frequency>48000</sample-frequency>
<audio-channels>2</audio-channels>
<agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
<buffer size="10485760" chunk-size="262144" fill-size="524288"/>
</profile>
</profiles>
</transcoding>
</config>

View File

@ -0,0 +1,22 @@
#!/sbin/runscript
depend() {
need net #MYSQL#
}
start() {
ebegin "Starting MediaTomb"
start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
${MEDIATOMB_OPTIONS}
eend $?
}
stop () {
ebegin "Stopping MediaTomb"
start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
eend $?
}

View File

@ -0,0 +1,13 @@
https://sourceforge.net/tracker/?func=detail&aid=3173314&group_id=129766&atid=715782
https://bugs.gentoo.org/353733
--- a/src/zmm/object.h
+++ b/src/zmm/object.h
@@ -33,6 +33,7 @@
#define __ZMM_OBJECT_H__
#include <new> // for size_t
+#include <cstddef>
#include "atomic.h"
namespace zmm

View File

@ -0,0 +1,605 @@
--- mediatomb-0.12.1/configure.ac 2010-04-07 18:38:51.000000000 -0400
+++ mediatomb-0.12.1/configure.ac 2011-11-16 21:56:46.000000000 -0500
@@ -1006,14 +1006,23 @@
MOZLIB=smjs
],
[
- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
- AC_CHECK_LIB(mozjs, JS_NewObject,
+ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
+ AC_CHECK_LIB(mozjs185, JS_NewObject,
[
- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
- MOZLIB=mozjs
+ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
+ MOZLIB=mozjs185
],
[
- AC_MSG_ERROR([Spidermonkey not found in requested location $JS_SEARCH_LIBS])
+ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
+ AC_CHECK_LIB(mozjs, JS_NewObject,
+ [
+ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
+ MOZLIB=mozjs
+ ],
+ [
+ AC_MSG_ERROR([Spidermonkey not found in requested location $JS_SEARCH_LIBS])
+ ]
+ )
]
)
]
@@ -1036,39 +1045,58 @@
],
[
unset ac_cv_lib_smjs_JS_NewObject
- AC_CHECK_LIB(mozjs, JS_NewObject,
+ AC_CHECK_LIB(mozjs185, JS_NewObject,
[
- MOZLIB=mozjs
- JS_LIBS="-lmozjs"
+ MOZLIB=mozjs185
+ JS_LIBS="-lmozjs185"
],
[
- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
- unset ac_cv_lib_js_JS_NewObject
- AC_CHECK_LIB(js, JS_NewObject,
- [
- JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
- MOZLIB=js
- ],
- [
- unset ac_cv_lib_smjs_JS_NewObject
- AC_CHECK_LIB(smjs, JS_NewObject,
- [
- JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
- MOZLIB=smjs
- ],
- [
- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
- unset ac_cv_lib_mozjs_JS_NewObject
- AC_CHECK_LIB(mozjs, JS_NewObject,
- [
- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
- MOZLIB=mozjs
- ],
- [
- JS_OK=missing
- AC_MSG_RESULT(libjs/libsmjs link failed, giving up)
- ]
- )
+ unset ac_cv_lib_smjs_JS_NewObject
+ AC_CHECK_LIB(mozjs, JS_NewObject,
+ [
+ MOZLIB=mozjs
+ JS_LIBS="-lmozjs"
+ ],
+ [
+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
+ unset ac_cv_lib_js_JS_NewObject
+ AC_CHECK_LIB(js, JS_NewObject,
+ [
+ JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
+ MOZLIB=js
+ ],
+ [
+ unset ac_cv_lib_smjs_JS_NewObject
+ AC_CHECK_LIB(smjs, JS_NewObject,
+ [
+ JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
+ MOZLIB=smjs
+ ],
+ [
+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
+ unset ac_cv_lib_mozjs_JS_NewObject
+ AC_CHECK_LIB(mozjs185, JS_NewObject,
+ [
+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
+ MOZLIB=mozjs185
+ ],
+ [
+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
+ unset ac_cv_lib_mozjs_JS_NewObject
+ AC_CHECK_LIB(mozjs, JS_NewObject,
+ [
+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
+ MOZLIB=mozjs
+ ],
+ [
+ JS_OK=missing
+ AC_MSG_RESULT(libjs/libsmjs link failed, giving up)
+ ]
+ )
+ ]
+ )
+ ]
+ )
]
)
]
diff -ur mediatomb-0.12.1.orig/build/Makefile.in mediatomb-0.12.1/build/Makefile.in
--- mediatomb-0.12.1.orig/build/Makefile.in 2010-04-07 18:40:15.000000000 -0400
+++ mediatomb-0.12.1/build/Makefile.in 2011-11-16 22:28:06.000000000 -0500
@@ -257,7 +257,7 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = -fpermissive @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
diff -ur mediatomb-0.12.1.orig/src/scripting/import_script.cc mediatomb-0.12.1/src/scripting/import_script.cc
--- mediatomb-0.12.1.orig/src/scripting/import_script.cc 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/import_script.cc 2011-11-16 22:28:06.000000000 -0500
@@ -53,8 +53,8 @@
try
{
load(scriptPath);
- root = JS_NewScriptObject(cx, script);
- JS_AddNamedRoot(cx, &root, "ImportScript");
+ root = JS_NewObject(cx, NULL, script, NULL);
+ JS_AddNamedObjectRoot(cx, &root, "ImportScript");
}
catch (Exception ex)
{
@@ -117,7 +117,7 @@
#endif
if (root)
- JS_RemoveRoot(cx, &root);
+ JS_RemoveObjectRoot(cx, &root);
#ifdef JS_THREADSAFE
JS_EndRequest(cx);
diff -ur mediatomb-0.12.1.orig/src/scripting/js_functions.cc mediatomb-0.12.1/src/scripting/js_functions.cc
--- mediatomb-0.12.1.orig/src/scripting/js_functions.cc 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/js_functions.cc 2011-11-16 22:28:21.000000000 -0500
@@ -49,30 +49,45 @@
extern "C" {
JSBool
-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+js_print(JSContext *cx, uintN argc, jsval *argv)
{
- uintN i;
+ uintN i, j;
JSString *str;
for (i = 0; i < argc; i++)
{
- str = JS_ValueToString(cx, argv[i]);
+ String fmtStr;
+ for (j = 0; j < argc; j++)
+ {
+ if (j == i)
+ fmtStr = fmtStr + "S";
+ else
+ fmtStr = fmtStr + "*";
+ }
+ if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), fmtStr.c_str(), &str))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+
if (!str)
return JS_TRUE;
- argv[i] = STRING_TO_JSVAL(str);
- log_js("%s\n", JS_GetStringBytes(str));
+
+ char * log_str = JS_EncodeString(cx, str);
+ log_js("%s\n", log_str);
+ JS_free(cx, log_str);
}
return JS_TRUE;
}
JSBool
-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+js_copyObject(JSContext *cx, uintN argc, jsval *argv)
{
jsval arg;
JSObject *js_cds_obj;
JSObject *js_cds_clone_obj;
- Script *self = (Script *)JS_GetPrivate(cx, obj);
+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
try
{
@@ -91,7 +106,7 @@
self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
+ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
return JS_TRUE;
@@ -110,28 +125,58 @@
}
JSBool
-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
{
try
{
- jsval arg;
- JSString *str;
- String path;
- String containerclass;
+ // Inputs from native code
+ JSObject *js_cds_obj = NULL;
+ JSString *str = NULL;
+ JSString *cont = NULL;
- JSObject *js_cds_obj;
+ String path = nil;
+ String containerclass = nil;
+
+ JSObject *obj = JS_THIS_OBJECT(cx, argv);
JSObject *js_orig_obj = NULL;
Ref<CdsObject> orig_object;
Ref<StringConverter> p2i;
Ref<StringConverter> i2i;
+ switch (argc)
+ {
+ case 0:
+ log_debug("No input arguments given\n");
+ return JS_FALSE;
+ case 1:
+ if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), "o", &js_cds_obj))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ case 2:
+ if(!JS_ConvertArguments(cx, 2, JS_ARGV(cx, argv), "oS", &js_cds_obj, &str))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ default:
+ if(!JS_ConvertArguments(cx, 3, JS_ARGV(cx, argv), "oSS", &js_cds_obj, &str, &cont))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ }
Script *self = (Script *)JS_GetPrivate(cx, obj);
if (self == NULL)
{
log_debug("Could not retrieve class instance from global object\n");
- return JS_FALSE;
+ return JS_TRUE;
}
if (self->whoami() == S_PLAYLIST)
@@ -142,26 +187,17 @@
{
i2i = StringConverter::i2i();
}
-
- arg = argv[0];
- if (!JSVAL_IS_OBJECT(arg))
- return JS_TRUE;
- if (!JS_ValueToObject(cx, arg, &js_cds_obj))
- return JS_TRUE;
- // root it
- argv[0] = OBJECT_TO_JSVAL(js_cds_obj);
- str = JS_ValueToString(cx, argv[1]);
if (!str)
path = _("/");
else
- path = JS_GetStringBytes(str);
+ path = JS_EncodeString(cx, str);
+
- JSString *cont = JS_ValueToString(cx, argv[2]);
if (cont)
{
- containerclass = JS_GetStringBytes(cont);
+ containerclass = JS_EncodeString(cx, cont);
if (!string_ok(containerclass) || containerclass == "undefined")
containerclass = nil;
}
@@ -177,9 +213,6 @@
return JS_TRUE;
}
- // root it
- argv[1] = OBJECT_TO_JSVAL(js_orig_obj);
-
orig_object = self->jsObject2cdsObject(js_orig_obj, self->getProcessedObject());
if (orig_object == nil)
return JS_TRUE;
@@ -285,8 +318,7 @@
JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
if (!str2)
return JS_TRUE;
- *rval = STRING_TO_JSVAL(str2);
-
+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
return JS_TRUE;
}
catch (ServerShutdownException se)
@@ -302,7 +334,7 @@
return JS_TRUE;
}
-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
{
try
{
@@ -321,7 +353,7 @@
{
str = JS_ValueToString(cx, argv[0]);
if (str)
- result = JS_GetStringBytes(str);
+ result = JS_EncodeString(cx, str);
}
if (result != nil)
@@ -330,7 +362,7 @@
JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
if (!str2)
return JS_TRUE;
- *rval = STRING_TO_JSVAL(str2);
+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
}
}
catch (ServerShutdownException se)
@@ -347,24 +379,23 @@
}
-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
{
- return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
}
-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
{
- return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
-}
+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
{
- return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
}
-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
{
- return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
}
} // extern "C"
diff -ur mediatomb-0.12.1.orig/src/scripting/js_functions.h mediatomb-0.12.1/src/scripting/js_functions.h
--- mediatomb-0.12.1.orig/src/scripting/js_functions.h 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/js_functions.h 2011-11-16 22:28:06.000000000 -0500
@@ -40,18 +40,18 @@
extern "C" {
/// \brief Log output.
-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
/// \brief Adds an object to the database.
-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
/// \brief Makes a copy of an CDS object.
-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
} // extern "C"
diff -ur mediatomb-0.12.1.orig/src/scripting/playlist_parser_script.cc mediatomb-0.12.1/src/scripting/playlist_parser_script.cc
--- mediatomb-0.12.1.orig/src/scripting/playlist_parser_script.cc 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/playlist_parser_script.cc 2011-11-16 22:28:06.000000000 -0500
@@ -46,9 +46,9 @@
extern "C" {
static JSBool
-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+js_readln(JSContext *cx, uintN argc, jsval *argv)
{
- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
+ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
String line;
@@ -69,7 +69,7 @@
JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
- *rval = STRING_TO_JSVAL(jsline);
+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
return JS_TRUE;
}
@@ -93,8 +93,8 @@
String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT);
load(scriptPath);
- root = JS_NewScriptObject(cx, script);
- JS_AddNamedRoot(cx, &root, "PlaylistScript");
+ root = JS_NewObject(cx, NULL, script, NULL);
+ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
}
catch (Exception ex)
{
@@ -245,7 +245,7 @@
#endif
if (root)
- JS_RemoveRoot(cx, &root);
+ JS_RemoveObjectRoot(cx, &root);
#ifdef JS_THREADSAFE
JS_EndRequest(cx);
diff -ur mediatomb-0.12.1.orig/src/scripting/script.cc mediatomb-0.12.1/src/scripting/script.cc
--- mediatomb-0.12.1.orig/src/scripting/script.cc 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/script.cc 2011-11-16 22:28:06.000000000 -0500
@@ -87,7 +87,7 @@
str = JS_ValueToString(cx, val);
if (! str)
return nil;
- return JS_GetStringBytes(str);
+ return JS_EncodeString(cx, str);
}
int Script::getBoolProperty(JSObject *obj, String name)
@@ -427,14 +427,14 @@
try
{
common_script = _load(common_scr_path);
- common_root = JS_NewScriptObject(cx, common_script);
- JS_AddNamedRoot(cx, &common_root, "common-script");
+ common_root = JS_NewObject(cx, NULL, common_script, NULL);
+ JS_AddNamedObjectRoot(cx, &common_root, "common-script");
_execute(common_script);
}
catch (Exception e)
{
if (common_root)
- JS_RemoveRoot(cx, &common_root);
+ JS_RemoveObjectRoot(cx, &common_root);
log_js("Unable to load %s: %s\n", common_scr_path.c_str(),
e.getMessage().c_str());
@@ -460,7 +460,7 @@
JS_BeginRequest(cx);
#endif
if (common_root)
- JS_RemoveRoot(cx, &common_root);
+ JS_RemoveObjectRoot(cx, &common_root);
/*
* scripts are unrooted and will be cleaned up by GC
@@ -504,11 +504,11 @@
static JSClass global_class =
{
"global", /* name */
- JSCLASS_HAS_PRIVATE, /* flags */
+ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
JS_PropertyStub, /* add property */
JS_PropertyStub, /* del property */
JS_PropertyStub, /* get property */
- JS_PropertyStub, /* set property */
+ JS_StrictPropertyStub, /* set property */
JS_EnumerateStandardClasses, /* enumerate */
JS_ResolveStub, /* resolve */
JS_ConvertStub, /* convert */
@@ -517,7 +517,7 @@
};
/* create the global object here */
- glob = JS_NewObject(cx, &global_class, NULL, NULL);
+ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
if (! glob)
throw _Exception(_("Scripting: could not initialize glboal class"));
@@ -539,12 +539,12 @@
throw _Exception(_("Scripting: JS_DefineFunctions failed"));
}
-JSScript *Script::_load(zmm::String scriptPath)
+JSObject *Script::_load(zmm::String scriptPath)
{
if (glob == NULL)
initGlobalObject();
- JSScript *scr;
+ JSObject *scr;
String scriptText = read_text_file(scriptPath);
@@ -571,14 +571,11 @@
void Script::load(zmm::String scriptPath)
{
- if (script)
- JS_DestroyScript(cx, script);
-
script = _load((scriptPath));
}
-void Script::_execute(JSScript *scr)
+void Script::_execute(JSObject *scr)
{
jsval ret_val;
@@ -662,7 +659,7 @@
JSObject *js_meta = getObjectProperty(js, _("meta"));
if (js_meta)
{
- JS_AddNamedRoot(cx, &js_meta, "meta");
+ JS_AddNamedObjectRoot(cx, &js_meta, "meta");
/// \todo: only metadata enumerated in MT_KEYS is taken
for (int i = 0; i < M_MAX; i++)
{
@@ -687,7 +684,7 @@
}
}
}
- JS_RemoveRoot(cx, &js_meta);
+ JS_RemoveObjectRoot(cx, &js_meta);
}
// stuff that has not been exported to js
diff -ur mediatomb-0.12.1.orig/src/scripting/script.h mediatomb-0.12.1/src/scripting/script.h
--- mediatomb-0.12.1.orig/src/scripting/script.h 2010-03-25 10:58:05.000000000 -0400
+++ mediatomb-0.12.1/src/scripting/script.h 2011-11-16 22:28:06.000000000 -0500
@@ -66,8 +66,8 @@
JSRuntime *rt;
JSContext *cx;
JSObject *glob;
- JSScript *script;
- JSScript *common_script;
+ JSObject *script;
+ JSObject *common_script;
public:
Script(zmm::Ref<Runtime> runtime);
@@ -115,8 +115,8 @@
JSObject *common_root;
void initGlobalObject();
- JSScript *_load(zmm::String scriptPath);
- void _execute(JSScript *scr);
+ JSObject *_load(zmm::String scriptPath);
+ void _execute(JSObject *scr);
zmm::Ref<StringConverter> _p2i;
zmm::Ref<StringConverter> _j2i;
zmm::Ref<StringConverter> _f2i;

View File

@ -0,0 +1,122 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1.ebuild,v 1.7 2011/11/17 03:40:31 axs Exp $
EAPI=2
inherit autotools-utils eutils linux-info
DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
HOMEPAGE="http://www.mediatomb.cc/"
SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="debug +exif +ffmpeg inotify +javascript lastfm libextractor +mp4 mysql +taglib thumbnail"
DEPEND="
mysql? ( virtual/mysql )
!mysql? ( >=dev-db/sqlite-3 )
javascript? ( dev-lang/spidermonkey )
dev-libs/expat
taglib? ( media-libs/taglib )
!taglib? ( media-libs/id3lib )
lastfm? ( >=media-libs/lastfmlib-0.4 )
exif? ( media-libs/libexif )
libextractor? ( media-libs/libextractor )
mp4? ( media-libs/libmp4v2 )
ffmpeg? ( virtual/ffmpeg )
thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
net-misc/curl
sys-apps/file
sys-libs/zlib
virtual/libiconv"
RDEPEND="${DEPEND}"
pkg_setup() {
if use inotify; then
if ! linux_config_exists \
|| ! linux_chkconfig_present INOTIFY_USER; then
ewarn "Please enable Inotify support in your kernel:"
ewarn
ewarn " File systems --->"
ewarn " [*] Inotify support for userspace"
ewarn
fi
fi
enewgroup mediatomb
enewuser mediatomb -1 -1 /dev/null mediatomb
}
src_prepare() {
epatch "${FILESDIR}/${P}-gcc46.patch"
epatch "${FILESDIR}/030-libav-0.7-support.patch"
if use javascript && has_version ">=dev-lang/spidermonkey-1.8.5" ; then
epatch "${FILESDIR}"/${P}-mozjs185.patch
eautoreconf
fi
}
src_configure() {
if use thumbnail; then
elog "libextrator does not work with thumbnail, disabling libextrator"
myconf="${myconf} --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
elif ! use thumbnail && use ffmpeg && use libextractor; then
elog "libextrator does not work with ffmpeg, disabling libextrator"
myconf="${myconf} --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
else
myconf="${myconf} $(use_enable thumbnail ffmpegthumbnailer) $(use_enable ffmpeg) $(use_enable libextractor)"
fi
econf \
$(use_enable debug tombdebug) \
$(use_enable exif libexif) \
$(use_enable inotify) \
$(use_enable javascript libjs) \
$(use_enable lastfm lastfmlib) \
$(use_enable mp4 libmp4v2) \
$(use_enable mysql) $(use_enable !mysql sqlite3) \
$(use_enable taglib) $(use_enable !taglib id3lib) \
--enable-curl \
--enable-external-transcoding \
--enable-libmagic \
--enable-protocolinfo-extension \
--enable-youtube \
--enable-zlib \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed!"
dodoc AUTHORS ChangeLog NEWS README TODO
sed -e "s:#MYSQL#:$(use mysql && has_version dev-db/mysql[-minimal] && echo "mysql"):" \
"${FILESDIR}/${PN}-0.12.0.initd" > "${T}/mediatomb.initd" || die
newinitd "${T}/mediatomb.initd" mediatomb || die
newconfd "${FILESDIR}/${PN}-0.12.0.confd" mediatomb || die
insinto /etc/mediatomb
newins "${FILESDIR}/${PN}-0.12.0.config" config.xml || die
fperms 0600 /etc/mediatomb/config.xml
fowners mediatomb:mediatomb /etc/mediatomb/config.xml
keepdir /var/lib/mediatomb
fowners mediatomb:mediatomb /var/lib/mediatomb
}
pkg_postinst() {
if use mysql; then
elog "MediaTomb has been built with MySQL support and needs"
elog "to be configured before being started."
elog "For more information, please consult the MediaTomb"
elog "documentation: http://mediatomb.cc/pages/documentation"
elog
fi
elog "To configure MediaTomb edit:"
elog "/etc/mediatomb/config.xml"
elog
elog "The MediaTomb web interface can be reached at (after the service is started):"
elog "http://localhost:49152/"
}

View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>video</herd>
<maintainer>
<email>darkside@gentoo.org</email>
</maintainer>
<use>
<flag name="inotify">Enable inotify filesystem monitoring support</flag>
<flag name="lastfm">Enable last.fm support</flag>
<flag name="libextractor">Use libextractor to gather files' metadata.</flag>
<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than
SQLite3. If this USE flag is disabled, <pkg>dev-db/sqlite</pkg> is used
instead.</flag>
<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files'
metadata rather than id3lib. If this USE flag is disabled
<pkg>media-libs/id3lib</pkg> is used instead.</flag>
<flag name="thumbnail">Enables video thumbnails generation through
<pkg>media-video/ffmpegthumbnailer</pkg></flag>
</use>
</pkgmetadata>

View File

@ -5,11 +5,13 @@ DIST deblob-2.6.35 90643 RMD160 3ddd784a9be90b98f126345fc71b45bc711b66a6 SHA1 a8
DIST deblob-2.6.36 90559 RMD160 32cc73f2b3fa0304e7ebf8c35f0501570ad08ce7 SHA1 71c2cc4bcdb800d46deac61cb9ac8c2cc51b1faa SHA256 fe4fb0cb06d017d1ec70f50c1c06e184c31c9bba6c4b359e43d54125d60501df
DIST deblob-2.6.37 97431 RMD160 8880f01ec565b3d5093caeacf7b1ee2b93d6f586 SHA1 a34daada57dc6d73cfc61b25dfcb248eac245337 SHA256 8beee2feddd27230aac078017d4927b67296941c855720560e58ab520abe7e2e
DIST deblob-2.6.38 99773 RMD160 f52e78df8e819319d0aabf24fe471e2ef9e02140 SHA1 0d176aa88f0525123d293e26617f2d287fabdddc SHA256 ddabcd846baa19b7e82adec3ca8ff17f2f7425c292516889098559f639e763eb
DIST deblob-3.1 103909 RMD160 723d36ef2574419417bbf30eda6a83aaa91922d7 SHA1 39d2c6e69f4e3b84e112b6e3e9389c983976fe4b SHA256 9dcf6f981cb3681f8afab0a4f814aebd6c2f46f8e635d2f35657d8344ef6b30e
DIST deblob-check-2.6.34 268995 RMD160 0186c8b3ef596feb0be938a7a75da620a7f425b2 SHA1 59f978b9455099c634947638ebf1ce6c82c1aead SHA256 2c995748c14bed50b93746a35a44b33138b2758031e3ef7d0159911cbab83c30
DIST deblob-check-2.6.35 269127 RMD160 2143e3f0fc362d90b00f5f05cdd6dac811f352d0 SHA1 6f2b976d64ad375db641ca9220fc40df1c5e3d8f SHA256 2cf4a02ab3e06512fe16d75704ceca9bd4d97fe0985ea0a0a34f64ce7fc18527
DIST deblob-check-2.6.36 285794 RMD160 2e3232ec9cbbb4874e90a4995372e2f10c0036e1 SHA1 f06f75e3b96d8bce109aa30ccab491624602795c SHA256 5e6fcb7110da5fb62edb0b85f169090de714cba2aac3cbfafbd84b6a860c8641
DIST deblob-check-2.6.37 328720 RMD160 6739c283f68b9de253071d757991d41618722cb8 SHA1 65d202793837b916974de3e0d2dfa5312cbfe31e SHA256 113898a885fce63b367ea6b7ddcf1e7c3ae47bac01617c228252a061433b6d32
DIST deblob-check-2.6.38 345831 RMD160 1caea73e54a21cb1100a4ee8226201ddd8a89985 SHA1 44de3ac14d9a3e94b97553051aff0ebfada45274 SHA256 6f681dbd1c1c44cba2c9902dd77a5a51b2d1cc81567cffc60ba92bd0bdd4ff2f
DIST deblob-check-3.1 405438 RMD160 da7efe959bc7c0017214daa764fcb486ff4434f2 SHA1 397157d3f6bf225f8cc4f48b6c05bc56482c2934 SHA256 77d125ae5466049fb3f1fe39ddb9320b66239de782a348c66133de591049db43
DIST genpatches-2.6.34-3.base.tar.bz2 7695 RMD160 3a5d82dfd4f19dcb06082265d6b0625629e388ff SHA1 a526ad552ad6a143104183a083be6d0b7ffdc340 SHA256 0b603ae584d4915653d5b3249eef00153ac1a2dca7ec4d300fc4d60300c72a48
DIST genpatches-2.6.34-3.extras.tar.bz2 15527 RMD160 988e3878a7c2a4676988e54010e8e8c76ed9d999 SHA1 1e218561e5d5c2d86e471245819dcc8ce022905e SHA256 7e99fb2c4320446b312110fc6f9f5e2bcc60127f80f80d8cb09c34483c68dca9
DIST genpatches-2.6.35-1.base.tar.bz2 6334 RMD160 2215f4824a8b7cefc3840aeae23a15b238599309 SHA1 c30fd6a62c182f3f4cc3b9df93fd88a52d15f5f8 SHA256 cccd5579b87f18a0affa3b9bedb93eb9abf177a8c8e4a352857267bfc718c52c
@ -22,17 +24,21 @@ DIST genpatches-2.6.38-5.base.tar.bz2 121256 RMD160 df96fd9e8a18a2b0738b90122dc1
DIST genpatches-2.6.38-5.extras.tar.bz2 15665 RMD160 39abb5818bdc5025ff9b6648f976e48ded035776 SHA1 c89301b292e398a31051fae885312aeb938c9278 SHA256 e4335af53a45ccb40396a6cbcac753ceb48c63aeea4f8fbb578070c1ab24d33f
DIST genpatches-2.6.38-8.base.tar.bz2 194001 RMD160 6abc3131bc8094131ab647a31f0297e58c7d2975 SHA1 a6fbe866c22003098c84e892c019867a09fbafc8 SHA256 99719da897d8f1371815ef5d0f486bfae18829c75d617d95602104805e390ac3
DIST genpatches-2.6.38-8.extras.tar.bz2 15675 RMD160 3d40e9fcad874591de0cc7497a52795ea04a9b9b SHA1 ca1b5f319e87960fa97ea6302dd0146901cacd9e SHA256 6d4c134be67714382efc8aec208c5a73d6c0f84d96acc76640b9ed3be93877a4
DIST genpatches-3.1-3.base.tar.bz2 15976 RMD160 6d489eebebc05e4dcf86b5aafd6375580466a497 SHA1 0ebd6a5af7687e1ce290d7bbd9b16997c4ddf2f4 SHA256 ad41964853e5100e6b63900a3745548f93aedf457199e321ea11c1e97e0a0dba
DIST genpatches-3.1-3.extras.tar.bz2 17197 RMD160 a275874317e13fc9f372eb6cdb08b79d67df5201 SHA1 85ed96b1602df0f1f68bc8c88de905cf5d1b0a5e SHA256 aee5dcccb9abc251d31caa0d565b78800cbc8e111cfa02b433cf6ebbdf04d4ea
DIST geos_one-patches-2.6.34-1-p5.tar.bz2 1980770 RMD160 251fec41b37695cefabf70961ee8b564a078b414 SHA1 664e692b7fcdf51b7049e4ad63b13b788c661413 SHA256 eee046a3985d154ba4c75e4d06809db06df4158e5c8f4a27cbff60c645bc5698
DIST geos_one-patches-2.6.35-2-p1.tar.bz2 1303662 RMD160 1e136af5b273a1c95ff29824a1a77b435b029b9a SHA1 6f0432eb5a11e7402a53666380751805ebcdba92 SHA256 902aecbf3c6044608eb17e7d5ebcff1d17d7c158ba96cb7f838e7f2a1d57a31e
DIST go-patches-2.6.36-2-p1.tar.bz2 986382 RMD160 9ee04544aaaf060097cfd56f0d6ae9c0607f92f3 SHA1 37c5f9c0dd7ed86b7d69b20f068394eb789c5527 SHA256 650fe499ba5e8782ebb7b81e781489c6eb20fb8fc0ffb2e860cad79cf02cde68
DIST go-patches-2.6.37-1-p1.tar.bz2 13448979 RMD160 11ce13f4afb8dba28268537e2d6778abc92866db SHA1 8341f648ae7927a0d43e674e4d8fbcb857c383ba SHA256 8c8879ff37138d961e884aef71a247ee6b1aff6721dc44a504e3fe6def0d5703
DIST go-patches-2.6.38-2-p1.tar.bz2 697893 RMD160 e123435c4560294b8cabcc42b7f6d4c88e92fccb SHA1 9c841f7d167fc472a2d463b786bd60f0f6d02503 SHA256 9b5cb51646a712f70b709fb3fd533f0c0768bc1aea4ca6de00b882b628a495e3
DIST go-patches-2.6.38-4-p2.tar.bz2 700999 RMD160 5eabf59513a82a46c4f775b5175d5972edfef283 SHA1 3232f3afc0938ac961d178f67de190db97c59147 SHA256 f4c788efe6bf2110387063a8b56ff157c5195d20feb45557c20b44293bf303c1
DIST go-patches-3.1.0-2.tar.bz2 235268 RMD160 98262b707338fd615906da43c9a5cd8835e34ff0 SHA1 020778aceb11163238c8a6b83d520a30443920e5 SHA256 73e4152987816d25bedc5832d7e66fba53bc1c12cbf9c0c59ac14392c5537392
DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
DIST next3-patches-2.6.34-1-p1.tar.bz2 155974 RMD160 b92e9574b59e309226c1418b77650c4a9433c5fc SHA1 c68d2f46be74583a5869d34147aba82b4c1875a6 SHA256 1c40472ef1053001982902c833c5e64227d400b414a5d0ac43f5b1cb9b1fde7b
DIST novfs-patches-2.6.34-1-p1.tar.bz2 69034 RMD160 eb719090a2dd440510e7b90639facddc47eadb2e SHA1 c33a90ce650ffe0ab7d16648d8d106af1510a79a SHA256 d6c13f5cd9cfc444bd70946a71c1cd5adc725c3915d8927f49039c99b4b7bdc9
EBUILD go-sources-2.6.34-r1.ebuild 1892 RMD160 2a2937799233a3885b0baf5ad46d6caa37f9c624 SHA1 545868a58ddf14a82fdf604d444227a0f4959ea4 SHA256 7a1646dbc69b64d2b14aa87edf13ce88956dced4915c8dbde3ecf06cfeac3b2e
@ -41,5 +47,6 @@ EBUILD go-sources-2.6.36-r2.ebuild 1354 RMD160 c93420f8e82d5c158e33f3df5ce2c0cca
EBUILD go-sources-2.6.37.ebuild 1354 RMD160 21a366263848f13ac1856ae97c8a57d98561d668 SHA1 3295bac6854146a8e81397b6a94fd04eaa583a4b SHA256 ce7b7824f56f5048699bd16fc5d2871f6f91ffaebbcb0613395ebd8afdb7e612
EBUILD go-sources-2.6.38-r4.ebuild 1355 RMD160 3676d1f797de8a74eaad586aa9d9fc751269135e SHA1 424b3686935884e292b2ea4beb03a9f750e66c32 SHA256 0dfe4439426d5c0b7785b42c62bead6cfd35909c1b26ffbb983b8bfc020109ed
EBUILD go-sources-2.6.38-r7.ebuild 1355 RMD160 9145019c05b11782933fed420da31975938fff45 SHA1 bbc845e53473f8ba1879ba3a1b68f7a7ad0ff9bb SHA256 7c8a725317f96dc2b64c344e9fa4f713ca5d8bde7eb497a7b2ba738e917ddbe7
EBUILD go-sources-3.1.0-r1.ebuild 1319 RMD160 293debc294aff61fdfac2bb6c8503495ef3090cf SHA1 e3321c6e8ebf07193fc4993c373fe84753e4af43 SHA256 426e5d547a706520a09505c995b03352b7df0654a64c5510fa47d4b3f5e7a527
MISC ChangeLog 11835 RMD160 871dfde743052e8909817ebb2f5f88c702812684 SHA1 16145f1d5d9dca265436e1e62b609dbe9ff1f7ac SHA256 79e849da378a0a42bb32f2b167550859a766e8826e3a045b72f6af77b3386fb1
MISC metadata.xml 345 RMD160 60ee7039e079df49ee78ddf07786baaa6e6d3911 SHA1 2379ca788bb885d4bc61135a34c1d08a911603e0 SHA256 58281654233eeae526297c33590827ab1d3919d69940adde934290ce8bf5bbd8

View File

@ -0,0 +1,45 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
ETYPE="sources"
K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="3"
K_DEBLOB_AVAILABLE="1"
GOPATCHES_VER="2"
GOPATCHES="go-patches-${PV}-${GOPATCHES_VER}.tar.bz2"
GOPATCHES_URI="http://ftp.disconnected-by-peer.at/go/${GOPATCHES}"
inherit kernel-2
detect_version
detect_arch
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
DESCRIPTION="Full sources including the Gentoo & Geos One patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${GOPATCHES_URI}"
UNIPATCH_LIST="${DISTDIR}/${GOPATCHES} ${DISTDIR}/${AAPATCHES}"
#UNIPATCH_EXCLUDE="6000_current-tuxonice-for-3.0.patch"
src_unpack() {
kernel-2_src_unpack
find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
}
pkg_postinst() {
kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
einfo
einfo "Make sure that your kernel configuration file is set with:"
einfo " CONFIG_SECURITY=y"
einfo " CONFIG_SECURITY_APPARMOR=y"
einfo "Without these, apparmor will not function."
}

View File

@ -1,3 +0,0 @@
DIST Colorer-take5-linux.be5.tar.bz2 2670000 RMD160 07ac0e0f9dbabf583284f2afd9c44b4edd7e5690 SHA1 db897c842bee371537475f85e155fa90011d961f SHA256 080c37c7921a4a9ed6d2130e5cf6fa7dfddefbd7a5780a259bdb9e15fef5aa28
DIST mod_highlight-0.1.0.tar.bz2 1799260 RMD160 0c734f4a52a04a310f2cd3dd9cf51c61f6852412 SHA1 b7fc0d5da66129473552bb22cbb4a4c3a210f1cc SHA256 b3ff50e6615b837d5ae9bc288a941929b83aedfc238e2a9b48ff15440a8ed570
EBUILD mod_highlight-0.1.0.ebuild 1253 RMD160 a5798a94b08f05e33b034ad92723b8717e5eb790 SHA1 897b5ad9d42abcd9d66b1b3272d7690f43a81dcc SHA256 4523342d5436a496e595394d76751143d8fea87e32ed1c78a0bf9b295e67a5d1

View File

@ -1,51 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/mod_gnutls-0.5.9.ebuild,v 1.1 2011/05/10 16:08:57 arfrever Exp $
EAPI="3"
inherit apache-module autotools
DESCRIPTION="mod_highlight provdes syntax highlighting as an Apache 2.0 Filter Module."
HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_highlight/"
SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2
mirror://sourceforge/colorer/Colorer-take5-linux.be5.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
DEPEND=""
RDEPEND="${DEPEND}"
APACHE2_MOD_CONF="47_${PN}"
APACHE2_MOD_DEFINE="HIGHLIGHT"
DOCFILES="NEWS NOTICE README README.ENV"
need_apache2
src_prepare() {
# rm -rf colorer/*
cd colorer
# unpack Colorer-take5-linux.be5.tar.bz2
epatch "${FILESDIR}"/colorer-optflags.diff
echo "all: colorer" >> Makefile.in
# eautoreconf
cd ..
}
src_configure() {
econf --with-apxs="${APXS}"
}
src_compile() {
emake -C colorer RPM_OPT_FLAGS="${CFLAGS} -fpermissive -Wall -fPIC" || die "emake failed"
emake || die "emake failed"
}
src_install() {
mv -f src/.libs/libmod_highlight.so src/.libs/${PN}.so
apache-module_src_install
}

View File

@ -1,11 +0,0 @@
# ChangeLog for www-apache/mod_svn_view
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
16 Jun 2011; Mario Fetka <mario.fetka@gmail.com> files/10_mod_svn_view.conf,
mod_svn_view-0.1.0_p148.ebuild:
correct config
16 Jun 2011; Mario Fetka <mario.fetka@gmail.com> files/10_mod_svn_view.conf:
initial commit

View File

@ -1,6 +0,0 @@
AUX 10_mod_svn_view.conf 618 RMD160 7322dfaf32af65fe0c4bb7e01c71ed2de364e485 SHA1 962c9aa96d54b1fd5feac7d2b3945647a12a69b1 SHA256 d6b1807d5c0ea4b8af658edb60e9509e4dd6f06be16b53567ab32f01a79fdc2a
AUX mod_svn_view-svn16x_fix.diff 806 RMD160 ec085b174de10499a7aefddfdd3349a065ad54e7 SHA1 3d37995febbcfc997956ac1e426ae1ea7b185ab1 SHA256 202f5bd1dc082ab6867f878a3531afb2b4995642723da41ae30ecf5d5b0c62ff
DIST mod_svn_view-0.1.0-r148.tar.bz2 2259880 RMD160 465317684662727ee69b2c36ef42c3b0c946b1b7 SHA1 8558fa2e4180e6ec95a03f7e7f81e47265a87efa SHA256 da7b06addc69b8d00917315e89b3dad2382cdb884341ebd4b890a39503676fca
EBUILD mod_svn_view-0.1.0_p148.ebuild 1228 RMD160 6bee8a975349908e28376eaab6fecb7855f2f511 SHA1 395ab13f57169dee8d5c4ee3c1ededa747b340c6 SHA256 668b655a15c1d6cddc8e9e25a597d9ac5b76cd604240e5091fe9d452d9dfaabe
MISC ChangeLog 352 RMD160 76aab522c6dd756c1e5a19416ae5bc5a668c2766 SHA1 6748f4cc157c15f3360f121f44d4430cd39a0bf0 SHA256 46c2d55c377419f8a4b526e17d7231b641ed4bce9c84cd330c159fafd3f6d61d
MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe

View File

@ -1,20 +0,0 @@
<IfDefine SVN_VIEW>
LoadModule svn_view_module modules/mod_svn_view.so
</IfDefine>
#<Directory "/usr/share/mod_svn_view/themes">
# Order allow,deny
# Allow from All
# Deny From none
#</Directory>
#<Location "/svn-view">
# SVNView on
# SVNViewRepository test /var/svn/repos/test
# SVNViewRepository apache-2.0 /var/svn/repos/httpd-2.0
# SVNViewRepository svn-mirror /var/svn/repos/subversion
# SVNViewAuthzSvnFile /var/svn/trunk/svn-authz
# SVNViewDefaultXSLT /usr/share/mod_svn_view/default.xsl
# SVNViewTheme blueview
# SVNViewThemesDir /usr/share/mod_svn_view/themes
#</Location>

View File

@ -1,23 +0,0 @@
diff -Naurp mod_svn_view/src/mod_svn_view.c mod_svn_view.oden/src/mod_svn_view.c
--- mod_svn_view/src/mod_svn_view.c 2006-04-05 13:55:17.000000000 +0200
+++ mod_svn_view.oden/src/mod_svn_view.c 2009-08-01 19:57:40.000000000 +0200
@@ -70,7 +70,7 @@
#include "svn_path.h"
#include "svn_utf.h"
#include "svn_time.h"
-
+#include "svn_props.h"
#include "mod_svn_view_private.h"
#define SVN_VIEW_VERSION VERSION
diff -Naurp mod_svn_view/src/view_rss.c mod_svn_view.oden/src/view_rss.c
--- mod_svn_view/src/view_rss.c 2006-04-05 13:55:17.000000000 +0200
+++ mod_svn_view.oden/src/view_rss.c 2009-08-01 19:57:35.000000000 +0200
@@ -30,6 +30,7 @@
#include "svn_path.h"
#include "svn_utf.h"
#include "svn_time.h"
+#include "svn_props.h"
#include "mod_svn_view_private.h"
#define SV_RSS_MAX_CHANGES 100

View File

@ -1,57 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit apache-module autotools
MY_PV=${PV/_p/-r}
KEYWORDS="amd64 ppc x86"
DESCRIPTION="A web-based view of a Subversion repository, similar to Chora."
HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_svn_view/"
SRC_URI="http://ftp.disconnected-by-peer.at/pub/mod_svn_view-${MY_PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
DEPEND=">=dev-libs/libxslt-1.1.5
>=dev-libs/libxml2-2.6.11"
RDEPEND="${DEPEND}
>=www-apache/mod_transform-0.6.0"
APACHE2_MOD_CONF="10_${PN}"
APACHE2_MOD_DEFINE="SVN_VIEW"
need_apache2
S=${WORKDIR}/${PN}
src_prepare() {
find . -name '.svn' | xargs rm -rf
epatch "${FILESDIR}"/mod_svn_view-svn16x_fix.diff
# libtool
sed -e "s|AC_PROG_RANLIB|AC_PROG_LIBTOOL|g" -i configure.ac
rm -rf autom4te.cache
touch ./config.in
AT_M4DIR="m4" eautoreconf
}
src_configure() {
econf --with-apxs=${APXS} || die "econf failed"
}
src_compile() {
emake || die "emake failed"
}
src_install() {
mkdir src/.libs
mv -f ".libs/mod_svn_view.so" "src/.libs/mod_svn_view.so"
apache-module_src_install
insinto /usr/share/${PN}
doins -r themes
doins xslt/default.xsl
}

View File

@ -0,0 +1,178 @@
# ChangeLog for www-client/httrack
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/ChangeLog,v 1.30 2011/04/21 16:40:31 vanquirius Exp $
*httrack-3.44.1 (21 Apr 2011)
21 Apr 2011; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.43.4.ebuild,
+httrack-3.44.1.ebuild:
3.44.1 version bump for bug 360409. Thanks again to tman.
*httrack-3.43.9 (08 Jun 2010)
08 Jun 2010; Marcelo Goes <vanquirius@gentoo.org> +httrack-3.43.9.ebuild:
3.43.9 version bump for bug 317713. Thanks to tman <cornicx at hotmail dot
com>.
01 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
httrack-3.43.7.ebuild:
Transfer Prefix keywords
*httrack-3.43.7 (22 Aug 2009)
22 Aug 2009; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.43.1.ebuild,
+httrack-3.43.7.ebuild:
3.43.7 version bump for bug 276779. Thanks to jon noble <jonnobleuk at gmail
dot com>.
*httrack-3.43.4 (17 May 2009)
17 May 2009; Marcelo Goes <vanquirius@gentoo.org> +httrack-3.43.4.ebuild:
Version bump for bug 269708. Thanks to Lars Wendler (Polynomial-C)
<polynomial-c at gentoo dot org>.
06 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> httrack-3.43.1.ebuild:
Add ~x86-fbsd keyword
*httrack-3.43.1 (14 Nov 2008)
14 Nov 2008; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.42.2.ebuild,
+httrack-3.43.1.ebuild:
3.43.1 version bump for bug 246383. Thanks to midnightflash <midnightflash
at gmx dot de>.
08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
httrack-3.42.3.ebuild:
ppc stable, bug #233563
04 Aug 2008; Tobias Heinlein <keytoaster@gentoo.org>
httrack-3.42.3.ebuild:
amd64 stable wrt security bug #233563
04 Aug 2008; Raúl Porcel <armin76@gentoo.org> httrack-3.42.3.ebuild:
sparc/x86 stable wrt #233563
*httrack-3.42.3 (03 Aug 2008)
03 Aug 2008; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.41.20.ebuild,
+httrack-3.42.3.ebuild:
3.42.3 version bump for bug 233563. Remove old ebuild.
17 Jul 2008; Kenneth Prugh <ken69267@gentoo.org> httrack-3.42.2.ebuild:
amd64 stable, bug #231733
16 Jul 2008; nixnut <nixnut@gentoo.org> httrack-3.42.2.ebuild:
Stable on ppc wrt bug 231733
15 Jul 2008; Raúl Porcel <armin76@gentoo.org> httrack-3.42.2.ebuild:
sparc/x86 stable wrt #231733
*httrack-3.42.2 (12 May 2008)
12 May 2008; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.40.2.ebuild,
+httrack-3.42.2.ebuild:
Version bump for bug 209279. Thanks to Tiziano Muller <dev-zero at gentoo
dot org>. Remove old ebuild.
16 Jun 2007; Christoph Mende <angelos@gentoo.org> httrack-3.41.20.ebuild:
Stable on amd64 wrt bug 180193
04 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
httrack-3.41.20.ebuild:
Stable on sparc wrt #180193
02 Jun 2007; nixnut <nixnut@gentoo.org> httrack-3.41.20.ebuild:
Stable on ppc wrt bug 180193
28 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> httrack-3.41.20.ebuild:
Mark 3.41.20 x86 stable.
*httrack-3.41.20 (17 Mar 2007)
17 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> +httrack-3.41.20.ebuild:
3.41.20 version bump for bug 171245. Thanks to Fabio Rossi <rossi.f at
inwind dot it>.
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
25 Mar 2006; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.23.ebuild,
-httrack-3.32.2.ebuild:
Remove old ebuilds.
17 Mar 2006; Chris White <chriswhite@gentoo.org> httrack-3.40.2.ebuild:
ppc stable for 3.40.2.
13 Mar 2006; Marcelo Goes <vanquirius@gentoo.org> httrack-3.40.2.ebuild:
Mark 3.40.2 x86 stable.
*httrack-3.40.2 (24 Feb 2006)
24 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -httrack-3.40.ebuild,
+httrack-3.40.2.ebuild:
3.40.2 version bump, hopefully fixes bug 123868, reported by Mehmet Kemal
EROL <mehmetkemal at gmx dot net>.
19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> httrack-3.40.ebuild:
It still will not compile in parallel, re-adding -j1 dirty, dirty hack.
*httrack-3.40 (19 Feb 2006)
19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> +metadata.xml,
-httrack-3.30.ebuild, -httrack-3.33.ebuild, +httrack-3.40.ebuild:
3.40 version bump for bug 123183. Request by gdub <gdub at ece dot utexas
dot edu>. Also, making myself maintainer of this package.
*httrack-3.33 (05 Apr 2005)
05 Apr 2005; Pieter Van den Abeele <pvdabeel@gentoo.org> +httrack-3.33.ebuild:
Version bump, thanks to Davy Van Nieuwenborgh for reporting.
*httrack-3.32.2 (18 Mar 2005)
*httrack-3.30 (18 Mar 2005)
*httrack-3.23 (18 Mar 2005)
18 Mar 2005; Seemant Kulleen <seemant@gentoo.org> +httrack-3.23.ebuild,
+httrack-3.30.ebuild, +httrack-3.32.2.ebuild:
Moved from net-www/httrack to www-client/httrack.
27 Feb 2005; Jason Wever <weeve@gentoo.org> httrack-3.32.2.ebuild:
Added ~sparc keyword.
23 Oct 2004; Simon Stelling <blubb@gentoo.org> httrack-3.32.2.ebuild:
added ~amd64
04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
httrack-3.32.2.ebuild:
Masked httrack-3.32.2.ebuild stable for ppc
01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> httrack-3.23.ebuild,
httrack-3.30.ebuild, httrack-3.32.2.ebuild:
virtual/glibc -> virtual/libc
26 Jun 2004; Sven Wegener <swegener@gentoo.org> httrack-3.32.2.ebuild:
Package is not parallel build capable, added -j1. Closes bug #54756.
*httrack-3.32.2 (21 Jun 2004)
21 Jun 2004; David Holm <dholm@gentoo.org> +httrack-3.32.2.ebuild:
Version bump.
*httrack-3.30 (04 Mar 2004)
04 Mar 2004; David Holm <dholm@gentoo.org> httrack-3.30.ebuild:
Version bump.
*httrack-3.23 (18 Mar 2003)
18 Mar 2003; Seth Chandler <sethbc@gentoo.org>; httrack-3.22.ebuild,
httrack-3.22.ebuild, httrack-3.23.ebuild:
bumpage+fixes
*httrack-3.22-3 (09 Feb 2003)
15 Feb 2003; Seth Chandler <sethbc@gentoo.org>:httrack-3.22.ebuild
updated some doc stuff...
09 Feb 2003; Seth Chandler <sethbc@gentoo.org>: httrack-3.22.ebuild
added httrack to portage thanks to Ricardo Cordeiro
<Ricardo.Cordeiro@iscte.pt> among others who submitted ebuilds

View File

@ -0,0 +1,4 @@
DIST httrack-3.44.1.tar.gz 1664216 RMD160 04644ba0300b92392a255965d1c7191fe4f186fc SHA1 5bdbc0b294b25929e52bc932e076c9e349a18fa9 SHA256 af95a730eff665d8275770951e8816bb29def5dc66d9faeaad91f93f686c9ddd
EBUILD httrack-3.44.1.ebuild 754 RMD160 f07d67ae16aec89cbfd6229f9bc4cfa4dab93d10 SHA1 7137c79e68999b1cc7b9a448ce42aed85acdbf8d SHA256 5b3100432f3c7769784f776974277c352e032dc3c2e9fef1855dc018c7192faf
MISC ChangeLog 6036 RMD160 9318b39c19ea1c3fb48506f6ce10797ec081e0f4 SHA1 e1826245afc70d9251c0b79789169786d196f02d SHA256 6840a46d5f588a66124f58c273f6ddd421ef4356a051ddf8278729dfdb6a8400
MISC metadata.xml 231 RMD160 5ffc63b4d4166adf83af9e571b24e435f58f2065 SHA1 4e3bdb071fefd1bd2e75574c6d54097ee8707768 SHA256 5893ff74a54adcf08dadf759b6e8ed0ca68f01fbdb3784c2e7dd5b53984f2a8d

View File

@ -0,0 +1,27 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.44.1.ebuild,v 1.1 2011/04/21 16:40:31 vanquirius Exp $
inherit versionator
DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
HOMEPAGE="http://www.httrack.com/"
SRC_URI="http://download.httrack.com/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
src_compile() {
sed -i '1i#define OF(x) x' src/minizip/*.h
econf || die
# won't compile in parallel
emake -j1 || die
}
src_install() {
make DESTDIR="${D}" install || die
dodoc AUTHORS README greetings.txt history.txt
dohtml httrack-doc.html
}

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>vanquirius@gentoo.org</email>
<name>Marcelo Goes</name>
</maintainer>
</pkgmetadata>

2787
www-client/iron/ChangeLog Normal file

File diff suppressed because it is too large Load Diff

15
www-client/iron/Manifest Normal file
View File

@ -0,0 +1,15 @@
AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
AUX chromium-kerberos-r0.patch 944 RMD160 25fccaa4406b1f964d72c94fd414a9955fc69ddd SHA1 b8b8f2cf6df1bade7af45d8f24b65acc602e781f SHA256 75b75f241675178dff914e0ddacc910a2583b2e2077e805f3ea1b2eed8513e21
AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
AUX chromium-system-libevent-r0.patch 404 RMD160 0dc32cfbd0770e4be1b6f9d3cf8ac08987a5992d SHA1 f6127a903eeb4ce13a4f8fc75dda0102e68d759a SHA256 127945ad45ede0e2aefbc28d8d5eb241675abb83f3aedc2569133e437f98a841
AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9
AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda
AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059
DIST iron-14.0.850.0-src.7z.001 314572800 RMD160 370aa6b170612c9aa4d6979661efd3fabd48d123 SHA1 3beeb6b4aaa01fb87c6e163d105d4efbcbc208d3 SHA256 4789cdc493617d4ed89f5a842adc9bc94441e1836b09ec673fa23996d3201207
DIST iron-14.0.850.0-src.7z.002 314572800 RMD160 046bdcba089f57c680467e21e30c65d300860bcc SHA1 e8893fe5bfa308f7291ed1ad6c33273b4bd65519 SHA256 b0505b8f4f04c1c057a99e9c706ac6543f824788f9b56b1a09907c7b46e17d0a
DIST iron-14.0.850.0-src.7z.003 257718232 RMD160 104415be31d9fd1aecc27385a3a36c5279929e1c SHA1 f9f7f6f165a63092f98e067b5e5fb87b759e28fc SHA256 5238915c1e4188ff7029e8b30f065d5d3ffabf6d7dfee512bc5b6eb36288735f
EBUILD iron-14.0.850.0.ebuild 14558 RMD160 a37468d16070898e0cbd1738a623ad8c9e59f393 SHA1 ba4783d0569d65dc3528fffabd126161b2312977 SHA256 9ec91058251217e491930ad7442a2aa6d73cc77c590d98d9182ae4ebfa5ec1ca
MISC ChangeLog 105965 RMD160 f7229960caa09549058a3e4354ead903c0ac72fb SHA1 73211c187e3fe911e6860ccc934b58ce3b9c17ac SHA256 c3df50dc0b418bcf5e3b13f6a855bb05a48070ced5410c307357941ef0d5077e
MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
<default-apps>
<web-browsers>
<web-browser>
<name>Chromium</name>
<executable>chromium-browser</executable>
<command>chromium-browser %s</command>
<icon-name>chromium-browser</icon-name>
<run-in-terminal>false</run-in-terminal>
</web-browser>
</web-browsers>
</default-apps>

View File

@ -0,0 +1,53 @@
this patch fixes build failures with ICU 4.8
http://codereview.chromium.org/7421003/
https://bugs.gentoo.org/show_bug.cgi?id=374903
--- v8/src/extensions/experimental/number-format.cc
+++ v8/src/extensions/experimental/number-format.cc
@@ -36,6 +36,8 @@
#include "unicode/numfmt.h"
#include "unicode/uchar.h"
#include "unicode/ucurr.h"
+#include "unicode/unum.h"
+#include "unicode/uversion.h"
namespace v8 {
namespace internal {
@@ -231,6 +233,8 @@
}
// Generates ICU number format pattern from given skeleton.
+// TODO(cira): Remove once ICU includes equivalent method
+// (see http://bugs.icu-project.org/trac/ticket/8610).
static icu::DecimalFormat* CreateFormatterFromSkeleton(
const icu::Locale& icu_locale,
const icu::UnicodeString& skeleton,
@@ -251,6 +255,7 @@
// Case of non-consecutive U+00A4 is taken care of in i18n.js.
int32_t end_index = skeleton.lastIndexOf(currency_symbol, index);
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6)
icu::NumberFormat::EStyles style;
switch (end_index - index) {
case 0:
@@ -262,6 +267,19 @@
default:
style = icu::NumberFormat::kPluralCurrencyStyle;
}
+#else // ICU version is 4.8 or above (we ignore versions below 4.0).
+ UNumberFormatStyle style;
+ switch (end_index - index) {
+ case 0:
+ style = UNUM_CURRENCY;
+ break;
+ case 1:
+ style = UNUM_CURRENCY_ISO;
+ break;
+ default:
+ style = UNUM_CURRENCY_PLURAL;
+ }
+#endif
base_format = static_cast<icu::DecimalFormat*>(
icu::NumberFormat::createInstance(icu_locale, style, *status));

View File

@ -0,0 +1,22 @@
Index: net/http/http_auth_gssapi_posix.cc
diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
index 431cfc4f2b54730fa6b46a6801c25cf691b7c878..aff2ac1114e09ec202b1ce4bd8d63ebd41483632 100644
--- a/net/http/http_auth_gssapi_posix.cc
+++ b/net/http/http_auth_gssapi_posix.cc
@@ -55,6 +55,16 @@ static gss_OID_desc GSS_C_NT_EXPORT_NAME_VAL = {
} // namespace
+// Heimdal >= 1.4 will define the following as preprocessor macros.
+// To avoid conflicting declarations, we have to undefine these.
+#undef GSS_C_NT_USER_NAME
+#undef GSS_C_NT_MACHINE_UID_NAME
+#undef GSS_C_NT_STRING_UID_NAME
+#undef GSS_C_NT_HOSTBASED_SERVICE_X
+#undef GSS_C_NT_HOSTBASED_SERVICE
+#undef GSS_C_NT_ANONYMOUS
+#undef GSS_C_NT_EXPORT_NAME
+
gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_VAL;
gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_VAL;
gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_VAL;

View File

@ -0,0 +1,32 @@
#!/bin/bash
# Allow the user to override command-line flags, bug #357629.
# This is based on Debian's chromium-browser package, and is intended
# to be consistent with Debian.
if [ -f /etc/chromium/default ] ; then
. /etc/chromium/default
fi
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
# default CHROMIUM_FLAGS (from /etc/chromium/default).
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
# Let the wrapped binary know that it has been run through the wrapper
export CHROME_WRAPPER="`readlink -f "$0"`"
PROGDIR="`dirname "$CHROME_WRAPPER"`"
case ":$PATH:" in
*:$PROGDIR:*)
# $PATH already contains $PROGDIR
;;
*)
# Append $PROGDIR to $PATH
export PATH="$PATH:$PROGDIR"
;;
esac
# Set the .desktop file name
export CHROME_DESKTOP="chromium-browser-chromium.desktop"
exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"

View File

@ -0,0 +1,12 @@
--- base/base.gyp.orig 2011-08-04 18:25:17.000000000 +0200
+++ base/base.gyp 2011-08-04 18:25:24.000000000 +0200
@@ -283,6 +283,9 @@
'message_pump_libevent_unittest.cc',
],
}, { # OS != "win"
+ 'dependencies': [
+ '../third_party/libevent/libevent.gyp:libevent'
+ ],
'sources/': [
['exclude', '^win/'],
],

View File

@ -0,0 +1,5 @@
# Default settings for chromium. This file is sourced by /bin/bash from
# the chromium launcher.
# Options to pass to chromium.
CHROMIUM_FLAGS=""

View File

@ -0,0 +1,9 @@
solutions = [
{ "name" : "src",
"url" : "http://src.chromium.org/svn/trunk/src",
"custom_deps" : {
"src/third_party/WebKit/LayoutTests": None,
},
"safesync_url": "http://chromium-status.appspot.com/lkgr",
},
]

View File

@ -0,0 +1,24 @@
#!/usr/bin/python2
import re
import sys
MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)")
MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)")
BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)")
PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)")
patterns = [MAJOR_VERSION_PATTERN,
MINOR_VERSION_PATTERN,
BUILD_NUMBER_PATTERN,
PATCH_LEVEL_PATTERN]
source = open(sys.argv[1]).read()
version_components = []
for pattern in patterns:
version_components.append(pattern.search(source).group(1).strip())
if version_components[len(version_components) - 1] == '0':
version_components.pop()
print '.'.join(version_components)

View File

@ -0,0 +1,8 @@
{
'targets': [
{
'target_name': 'nacl',
'type': 'static_library',
},
],
}

View File

@ -0,0 +1,464 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.102.ebuild,v 1.4 2011/10/28 13:50:45 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
pax-utils portability python toolchain-funcs versionator virtualx
DESCRIPTION="Secure Version of the Open-source Google Chrome web browser"
HOMEPAGE="http://www.srware.net/software_srware_iron_download.php"
SRC_URI="
http://rapidshare.com/files/422685582/src.7z.001 -> iron-${PV}-src.7z.001
http://rapidshare.com/files/422697601/src.7z.002 -> iron-${PV}-src.7z.002
http://rapidshare.com/files/422709880/src.7z.003 -> iron-${PV}-src.7z.003
http://ftp-disconnected-by-peer.at/iron/${PV}/iron-${PV}-src.7z.001
http://ftp-disconnected-by-peer.at/iron/${PV}/iron-${PV}-src.7z.002
http://ftp-disconnected-by-peer.at/iron/${PV}/iron-${PV}-src.7z.003"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
# en_US is ommitted on purpose from the list below. It must always be available.
LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
tr uk vi zh_CN zh_TW"
for lang in ${LANGS}; do
IUSE+=" linguas_${lang}"
done
RDEPEND="app-arch/bzip2
dev-libs/dbus-glib
>=dev-libs/icu-4.4.1
>=dev-libs/libevent-1.4.13
dev-libs/libxml2[icu]
dev-libs/libxslt
>=dev-libs/nss-3.12.3
gnome? ( >=gnome-base/gconf-2.24.0 )
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
>=media-libs/alsa-lib-1.0.19
media-libs/flac
virtual/jpeg
media-libs/libpng
>=media-libs/libwebp-0.1.2
media-libs/speex
pulseaudio? ( media-sound/pulseaudio )
cups? (
dev-libs/libgcrypt
>=net-print/cups-1.3.11
)
sys-libs/zlib
x11-libs/gtk+:2
x11-libs/libXinerama
x11-libs/libXScrnSaver
x11-libs/libXtst
kerberos? ( virtual/krb5 )"
DEPEND="${RDEPEND}
dev-lang/perl
>=dev-util/gperf-3.0.3
>=dev-util/pkgconfig-0.23
>=sys-devel/bison-2.4.3
sys-devel/flex
>=sys-devel/make-3.81-r2
test? (
dev-python/pyftpdlib
dev-python/simplejson
)"
RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
gyp_use() {
if [[ $# -lt 2 ]]; then
echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
return 1
fi
if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
}
egyp() {
set -- build/gyp_chromium --depth=. "${@}"
echo "${@}" >&2
"${@}"
}
# Chromium uses different names for some langs,
# return Chromium name corresponding to a Gentoo lang.
chromium_lang() {
if [[ "$1" == "es_LA" ]]; then
echo "es_419"
else
echo "$1"
fi
}
pkg_setup() {
CHROMIUM_HOME="/usr/$(get_libdir)/iron-browser"
# Make sure the build system will use the right tools, bug #340795.
tc-export AR CC CXX RANLIB
# Make sure the build system will use the right python, bug #344367.
python_set_active_version 2
python_pkg_setup
# Prevent user problems like bug #348235.
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
ewarn "You may experience really long compilation times and/or increased memory usage."
ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
fi
eshopts_pop
# Warn if the kernel doesn't support features useful for sandboxing,
# bug #363907.
CONFIG_CHECK="~PID_NS ~NET_NS"
check_extra_config
if use bindist; then
elog "bindist enabled: H.264 video support will be disabled."
else
elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
fi
}
src_prepare() {
cp "${FILESDIR}/nacl.gypi" chrome/ || die
# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
sed -i '1i#define OF(x) x' \
third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
chrome/common/zip.cc || die
# Backport http://codereview.chromium.org/8038051, fix for bug #383121.
epatch "${FILESDIR}/${PN}-kerberos-r0.patch"
epatch_user
# Remove most bundled libraries. Some are still needed.
find third_party -type f \! -iname '*.gyp*' \
\! -path 'third_party/WebKit/*' \
\! -path 'third_party/angle/*' \
\! -path 'third_party/cacheinvalidation/*' \
\! -path 'third_party/cld/*' \
\! -path 'third_party/expat/*' \
\! -path 'third_party/ffmpeg/*' \
\! -path 'third_party/flac/flac.h' \
\! -path 'third_party/gpsd/*' \
\! -path 'third_party/harfbuzz/*' \
\! -path 'third_party/hunspell/*' \
\! -path 'third_party/iccjpeg/*' \
\! -path 'third_party/launchpad_translations/*' \
\! -path 'third_party/leveldb/*' \
\! -path 'third_party/leveldatabase/*' \
\! -path 'third_party/libjingle/*' \
\! -path 'third_party/libphonenumber/*' \
\! -path 'third_party/libvpx/*' \
\! -path 'third_party/mesa/*' \
\! -path 'third_party/modp_b64/*' \
\! -path 'third_party/mongoose/*' \
\! -path 'third_party/npapi/*' \
\! -path 'third_party/openmax/*' \
\! -path 'third_party/ots/*' \
\! -path 'third_party/protobuf/*' \
\! -path 'third_party/sfntly/*' \
\! -path 'third_party/skia/*' \
\! -path 'third_party/smhasher/*' \
\! -path 'third_party/speex/speex.h' \
\! -path 'third_party/sqlite/*' \
\! -path 'third_party/tcmalloc/*' \
\! -path 'third_party/tlslite/*' \
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/webdriver/*' \
\! -path 'third_party/webgl_conformance/*' \
\! -path 'third_party/webrtc/*' \
\! -path 'third_party/yasm/*' \
\! -path 'third_party/zlib/contrib/minizip/*' \
-delete || die
# Make sure the build system will use the right python, bug #344367.
# Only convert directories that need it, to save time.
python_convert_shebangs -q -r 2 build tools
}
src_configure() {
local myconf=""
# Never tell the build system to "enable" SSE2, it has a few unexpected
# additions, bug #336871.
myconf+=" -Ddisable_sse2=1"
# Disable NaCl temporarily, this tarball doesn't have IRT.
myconf+=" -Ddisable_nacl=1"
# Disable WebRTC until they make PulseAudio dependency optional,
# bug #377847.
myconf+=" -Denable_webrtc=0"
# Use system-provided libraries.
# TODO: use_system_ffmpeg
# TODO: use_system_hunspell (upstream changes needed).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
# TODO: use_system_vpx
myconf+="
-Duse_system_bzip2=1
-Duse_system_flac=1
-Duse_system_icu=1
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
-Duse_system_libwebp=1
-Duse_system_libxml=1
-Duse_system_speex=1
-Duse_system_xdg_utils=1
-Duse_system_zlib=1"
# Optional dependencies.
# TODO: linux_link_kerberos, bug #381289.
myconf+="
$(gyp_use cups use_cups)
$(gyp_use gnome use_gconf)
$(gyp_use gnome-keyring use_gnome_keyring)
$(gyp_use gnome-keyring linux_link_gnome_keyring)
$(gyp_use kerberos use_kerberos)
$(gyp_use pulseaudio use_pulseaudio)"
# Enable sandbox.
myconf+="
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
if host-is-pax; then
# Prevent the build from failing (bug #301880). The performance
# difference is very small.
myconf+=" -Dv8_use_snapshot=0"
fi
# Our system ffmpeg should support more codecs than the bundled one
# for Chromium.
# myconf+=" -Dproprietary_codecs=1"
if ! use bindist; then
# Enable H.624 support in bundled ffmpeg.
myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
fi
local myarch="$(tc-arch)"
if [[ $myarch = amd64 ]] ; then
myconf+=" -Dtarget_arch=x64"
elif [[ $myarch = x86 ]] ; then
myconf+=" -Dtarget_arch=ia32"
elif [[ $myarch = arm ]] ; then
# TODO: check this again after
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
append-flags -fno-tree-sink
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
else
die "Failed to determine target arch, got '$myarch'."
fi
# Make sure that -Werror doesn't get added to CFLAGS by the build system.
# Depending on GCC version the warnings are different and we don't want
# the build to fail because of that.
myconf+=" -Dwerror="
# Avoid a build error with -Os, bug #352457.
replace-flags "-Os" "-O2"
egyp ${myconf} || die
}
src_compile() {
emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
pax-mark m out/Release/chrome
if use test; then
emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
fi
}
src_test() {
# For more info see bug #350349.
local mylocale='en_US.utf8'
if ! locale -a | grep -q "$mylocale"; then
eerror "${PN} requires ${mylocale} locale for tests"
eerror "Please read the following guides for more information:"
eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
eerror " http://www.gentoo.org/doc/en/utf-8.xml"
die "locale ${mylocale} is not supported"
fi
# For more info see bug #370957.
if [[ $UID -eq 0 ]]; then
die "Tests must be run as non-root. Please use FEATURES=userpriv."
fi
# For more info see bug #350347.
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
'--gtest_filter=-ICUStringConversionsTest.*'
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
# NetUtilTest: bug #361885.
# NetUtilTest.GenerateFileName: some locale-related mismatch.
# UDP: unstable, active development. We should revisit this later.
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*'
}
src_install() {
exeinto "${CHROMIUM_HOME}"
doexe out/Release/chrome || die
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
doexe out/Release/chromedriver || die
# Install Native Client files on platforms that support it.
# insinto "${CHROMIUM_HOME}"
# case "$(tc-arch)" in
# amd64)
# doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
# doins out/Release/libppGoogleNaClPluginChrome.so || die
# ;;
# x86)
# doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
# doins out/Release/libppGoogleNaClPluginChrome.so || die
# ;;
# esac
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
# It is important that we name the target "chromium-browser",
# xdg-utils expect it; bug #355517.
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
# keep the old symlink around for consistency
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
# Allow users to override command-line options, bug #357629.
dodir /etc/chromium || die
insinto /etc/chromium
newins "${FILESDIR}/chromium.default" "default" || die
# Support LINGUAS, bug #332751.
local pak
for pak in out/Release/locales/*.pak; do
local pakbasename="$(basename ${pak})"
local pakname="${pakbasename%.pak}"
local langname="${pakname//-/_}"
# Do not issue warning for en_US locale. This is the fallback
# locale so it should always be installed.
if [[ "${langname}" == "en_US" ]]; then
continue
fi
local found=false
local lang
for lang in ${LANGS}; do
local crlang="$(chromium_lang ${lang})"
if [[ "${langname}" == "${crlang}" ]]; then
found=true
break
fi
done
if ! $found; then
ewarn "LINGUAS warning: no ${langname} in LANGS"
fi
done
local lang
for lang in ${LANGS}; do
local crlang="$(chromium_lang ${lang})"
local pakfile="out/Release/locales/${crlang//_/-}.pak"
if [ ! -f "${pakfile}" ]; then
ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
fi
if ! use linguas_${lang}; then
rm "${pakfile}" || die
fi
done
insinto "${CHROMIUM_HOME}"
doins out/Release/chrome.pak || die
doins out/Release/resources.pak || die
doins -r out/Release/locales || die
doins -r out/Release/resources || die
newman out/Release/chrome.1 chromium.1 || die
newman out/Release/chrome.1 chromium-browser.1 || die
# Chromium looks for these in its folder
# See media_posix.cc and base_paths_linux.cc
# dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
# dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
# dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
doexe out/Release/libffmpegsumo.so || die
# Install icons and desktop entry.
for SIZE in 16 22 24 32 48 64 128 256 ; do
insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
chromium-browser.png || die
done
local mime_types="text/html;text/xml;application/xhtml+xml;"
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
make_desktop_entry chromium-browser "Chromium" chromium-browser \
"Network;WebBrowser" \
"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
# Install GNOME default application entry (bug #303100).
if use gnome; then
dodir /usr/share/gnome-control-center/default-apps || die
insinto /usr/share/gnome-control-center/default-apps
doins "${FILESDIR}"/chromium-browser.xml || die
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
# For more info see bug #292201, bug #352263, bug #361859.
elog
elog "Depending on your desktop environment, you may need"
elog "to install additional packages to get icons on the Downloads page."
elog
elog "For KDE, the required package is kde-base/oxygen-icons."
elog
elog "For other desktop environments, try one of the following:"
elog " - x11-themes/gnome-icon-theme"
elog " - x11-themes/tango-icon-theme"
# For more info see bug #359153.
elog
elog "Some web pages may require additional fonts to display properly."
elog "Try installing some of the following packages if some characters"
elog "are not displayed properly:"
elog " - media-fonts/arphicfonts"
elog " - media-fonts/bitstream-cyberbit"
elog " - media-fonts/droid"
elog " - media-fonts/ipamonafont"
elog " - media-fonts/ja-ipafonts"
elog " - media-fonts/takao-fonts"
elog " - media-fonts/wqy-microhei"
elog " - media-fonts/wqy-zenhei"
}
pkg_postrm() {
gnome2_icon_cache_update
}

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>chromium</herd>
<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
</pkgmetadata>