* [gentoo-commits] proj/mozilla:master commit in: x11-libs/pixman/, x11-libs/cairo/, x11-libs/cairo/files/, media-video/vlc/files/, ...
@ 2012-07-04 19:35 Jory Pratt
0 siblings, 0 replies; only message in thread
From: Jory Pratt @ 2012-07-04 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 288aae7d4e9beb9d5d2e09c91afa61e5c1aea08f
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 19:34:22 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 19:34:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=288aae7d
remove stale outdated builds, update spidermonkey-1.8.7-x32 patch
---
dev-java/icedtea-web/Manifest | 16 -
| 38 --
dev-java/icedtea-web/icedtea-web-1.1.1.ebuild | 147 --------
dev-java/icedtea-web/metadata.xml | 19 -
dev-lang/spidermonkey/Manifest | 2 +-
.../files/spidermonkey-1.8.7-x32.patch | 9 +-
media-video/vlc/Manifest | 5 -
.../0001-Support-building-against-NPAPI-SDK.patch | 36 --
media-video/vlc/metadata.xml | 81 -----
media-video/vlc/vlc-1.1.13.ebuild | 377 --------------------
x11-libs/cairo/Manifest | 5 -
x11-libs/cairo/cairo-1.11.2.ebuild | 158 --------
.../cairo/files/cairo-1.10.0-buggy_gradients.patch | 17 -
x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch | 55 ---
x11-libs/cairo/files/cairo-1.8.8-interix.patch | 16 -
x11-libs/pixman/Manifest | 2 -
x11-libs/pixman/pixman-0.24.2.ebuild | 53 ---
17 files changed, 8 insertions(+), 1028 deletions(-)
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
deleted file mode 100644
index 922279b..0000000
--- a/dev-java/icedtea-web/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7
-DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
-EBUILD icedtea-web-1.1.1.ebuild 4135 RMD160 c46e54bb74408834370f820a99dc2e71a6e40c55 SHA1 f5b58d296b2a8b06a0d313466396dfc27f1ca68d SHA256 f7e914de1d7d3ab99f9a7b53b726162fdce056b280507980e1f79a14bc64c861
-MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk5kj2YACgkQfXuS5UK5QB0PeQP9F8ZYxcPrc6emsos1xFMuKk1y
-9zQTy5LNgx0hN1jUTNbHhD6Udvuincy+ysb0D81NqdhBY5kvJtbZxFh8EIiH3vqD
-C/ndtk3rYIkJQfvLlh9J04GiZfhG1IAoL79FHaunARXVETiYB38SJkvh3R2LPJAz
-y1nl0phlAcCMJKZffWA=
-=5v6N
------END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
deleted file mode 100644
index 5e85961..0000000
--- a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7544a3364642a820737ba8d943e8deb2e39b6aa6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 5 Sep 2011 00:26:38 +0200
-Subject: [PATCH] Support using NPAPI-SDK headers instead of whole xulrunner.
-
-The first NPAPI-SDK header package with npapi-sdk.pc comes with libxul 2.0
-headers, thus hardcoded that version into it. But the code should be modified
-to use NPAPI versioning rather than Mozilla one. Or just drop compat with
-ancient versions.
----
- acinclude.m4 | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 3c3803b..58482f1 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -346,8 +346,15 @@ if test "x${enable_plugin}" = "xyes" ; then
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
-- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
--
-+ PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
-+ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
-+ # XXX: use NPAPI versions instead
-+ xulrunner_cv_collapsed_version=20000000
-+ ])
-+ ], [
-+ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-+ ])
-+
- AC_SUBST(MOZILLA_CFLAGS)
- AC_SUBST(MOZILLA_LIBS)
- fi
---
-1.7.6.1
-
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
deleted file mode 100644
index 968ba5f..0000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.1 2011/07/22 09:08:37 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="2"
-
-inherit autotools base eutils java-pkg-2 java-vm-2
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="build doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-DEPEND="${RDEPEND}
- nsplugin? (
- || ( net-misc/npapi-sdk
- >=net-libs/xulrunner-1.9.1 ) )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
- # quite a hack since java-config does not provide a way for a package
- # to limit supported VM's for building and their preferred order
- if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
- einfo "Honoring user-set JAVA_PKG_FORCE_VM"
- elif has_version dev-java/icedtea:${SLOT}; then
- JAVA_PKG_FORCE_VM="icedtea${SLOT}"
- else
- JAVA_PKG_FORCE_VM=""
- # don't die just yet if merging a binpkg - bug #258423
- DIE_IF_NOT_BINPKG=true
- fi
-
- # if the previous failed, don't even run java eclasses pkg_setup
- # as it might also die when no VM is present
- if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
- einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
- fi
-}
-
-unset_vars() {
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_unpack() {
- if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
- die "Unable to find a supported VM for building"
- fi
-
- default
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
- )
-
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- local vmhome=$(java-config -O)
-
- if use build; then
- icedteadir="${ICEDTEA_BIN_DIR}"
- installdir="/opt/icedtea${SLOT}-web-bin"
- else
- icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
- installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
- fi
-
- unset_vars
-
- if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
- VMHANDLE="icedtea${SLOT}"
- else
- die "Unexpected install location of IcedTea${SLOT}"
- fi
-
- einfo "Installing IcedTea-Web in ${installdir}"
- einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
- if [ ! -e ${vmhome} ] ; then
- eerror "Could not find JDK install directory ${vmhome}."
- die
- fi
-
- # we need to override all *dir variables that econf sets
- # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
- # the suffix the man page will end up compressed with, anyway
- econf \
- --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
- --with-jdk-home=${icedteadir} \
- $(use_enable doc docs) \
- $(use_enable nsplugin plugin) \
- || die "configure failed"
-}
-
-src_compile() {
- # we need this to override the src_compile from java-pkg-2
- default
-}
-
-src_install() {
- # parallel make problem bug #372235
- emake -j1 DESTDIR="${D}" install || die "Install failed"
- dodoc AUTHORS README NEWS || die
-
- if use nsplugin; then
- local arch=${ARCH};
- use x86 && arch=i386;
- install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
- fi
-
- for binary in javaws itweb-settings; do
- dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
- dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
- done
-}
-
-pkg_postinst() {
- java-vm_check-nsplugin
- java_mozilla_clean_
-
- if use nsplugin; then
- elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
- elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
- elog "such as Firefox 3.5+, Chromium and perhaps some others too."
- fi
-}
-
-pkg_prerm() {
- # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
- :;
-}
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
deleted file mode 100644
index 08e1286..0000000
--- a/dev-java/icedtea-web/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>gnu_andrew@member.fsf.org</email>
- <name>Andrew John Hughes</name>
- <description>Proxy Maintainer</description>
-</maintainer>
-<maintainer>
- <email>caster@gentoo.org</email>
- <name>Vlastimil Babka</name>
- <description>Commiter (CC me)</description>
-</maintainer>
-<longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription>
-<use>
- <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 1ec4117..0e4b810 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -2,7 +2,7 @@ AUX spidermonkey-1.8.5-arm_resprect_cflags-1.patch 2227 RMD160 d4c4c41c9cda62f12
AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
AUX spidermonkey-1.8.5-fix-ppc64.patch 1669 RMD160 b3f3037cca9cc56c5f5a3c4e7a7c34a8f5b05efd SHA1 74245c08ef7a289e545a11afaeea60406d3bf717 SHA256 ffae38a7e5db0895e10be924e1bd084e57640c7a184cd8f1b1a90e9533202470
AUX spidermonkey-1.8.7-filter_desc.patch 922 RMD160 2278dac6ff00e1c3650ed8ade491f142aa49f3d0 SHA1 462da04f7784530e02880bbc6ee5cabbe7ab0603 SHA256 7a3832a0a47f90b89a240b44ac580fff8740344c1d3eee0624973cb251043c46
-AUX spidermonkey-1.8.7-x32.patch 685 RMD160 995027504ab032fd2157c74cbe558ad795719e8a SHA1 071e8dd963b02d4b243da455fd168c0212c8078c SHA256 e7a212490b0f7d442f28b574f46e2665a0a8984f2bd288988f93be7c5cedd557
+AUX spidermonkey-1.8.7-x32.patch 753 RMD160 91337f85781fb37057b3b7194cccde8378fa6a4d SHA1 310cccac981c39d06198dd449ac3126484525e56 SHA256 0b223162cf7067d1dbbb950708265ccf20637fe4906564080d9c9c38b85e826d
DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
DIST js187-1.0.0.tar.gz 7106870 RMD160 34d7fccefb85eb74093aad63c96190cb903021ea SHA1 229d05f271933f66536c20da2b1fb8060989cbc4 SHA256 ce80a9eabdaf22d2a1c4830ea36120e6af207bb336bea8f6d34cba32f59fe2b4
DIST spidermonkey-1.8.7-patches-0.1.tar.xz 4796 RMD160 fc5bf0d85014a7d8d5c4f1f55866a44b8d5cd2bd SHA1 f54f7a761fef1bee23664d3736e3aaf38521a7e8 SHA256 ddc0431ed9a96b67c27787fa824f4456693b9361dbb41366f8196d1a3425a353
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
index 251698a..f14a269 100644
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-x32.patch
@@ -1,6 +1,6 @@
--- a/js/src/jslock.cpp 2012-04-06 16:24:51.000000000 -0500
+++ b/js/src/jslock.cpp 2012-06-21 20:57:00.877937542 -0500
-@@ -150,17 +150,17 @@
+@@ -150,17 +150,22 @@
static JS_ALWAYS_INLINE int
NativeCompareAndSwap(volatile jsword *w, jsword ov, jsword nv)
@@ -9,8 +9,12 @@
__asm__ __volatile__ (
"lock\n"
-- "cmpxchgq %2, (%1)\n"
++/* GCC's x32 abi support */
++#if defined(__LP64__)
+ "cmpxchgq %2, (%1)\n"
++#else
+ "cmpxchg %2, (%1)\n"
++#endif
"sete %%al\n"
"movzbl %%al, %%eax\n"
: "=a" (res)
@@ -18,3 +22,4 @@
: "cc", "memory");
return (int)res;
}
+
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
deleted file mode 100644
index 8c78c9d..0000000
--- a/media-video/vlc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0001-Support-building-against-NPAPI-SDK.patch 1441 RMD160 63dd43b85752f4f2dc671cfc1fada0cc71286ca2 SHA1 5e6336cf511e452e1b23f5da74d9a79bbeab8861 SHA256 66eefb895ab8b533e4e0499b66d74b41874a129464d89477d6ccb813cdad3d26
-DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
-DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
-EBUILD vlc-1.1.13.ebuild 12298 RMD160 ff4799a17e6a3e6587ef14f5bcb9bd581fc1431c SHA1 6611b627ba031daf0aac3d2164c0f909ebb81081 SHA256 640e1c1ad0fc2bdc986386af6e0c9b96bd95aebdcffebdf18e8518cfc0b8a5a7
-MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
diff --git a/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
deleted file mode 100644
index 00c9f86..0000000
--- a/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8d7943b1b19870b1aaa5d3058d79273661bbc25a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 5 Sep 2011 10:43:39 +0200
-Subject: [PATCH] Support building against NPAPI-SDK.
-
----
- configure.ac | 13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 86a7eac..de86fca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4563,12 +4563,19 @@
- found=1
- else
- if test -n "$PKG_CONFIG"; then
-- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
-+ for i in "${with_mozilla_pkg}" npapi-sdk {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin libxul; do
- if test -n "$i"
- then
- echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
-- AC_MSG_CHECKING([for $i >= 1.9.1])
-- if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&AS_MESSAGE_LOG_FD
-+
-+ AS_IF([test $i = npapi-sdk], [
-+ moz_ver=0.27
-+ ], [
-+ moz_ver=1.9.2
-+ ])
-+
-+ AC_MSG_CHECKING([for $i >= $moz_ver])
-+ if $PKG_CONFIG --exists --print-errors "$i >= $moz_ver" 2>&AS_MESSAGE_LOG_FD
- then
- echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
- echo "Using $i package." >&AS_MESSAGE_FD
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
deleted file mode 100644
index d076a80..0000000
--- a/media-video/vlc/metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>video</herd>
- <maintainer>
- <email>aballier@gentoo.org</email>
- <name>Alexis Ballier</name>
- </maintainer>
- <use>
- <flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
- <flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
- <flag name="avcodec">Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.</flag>
- <flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
- <flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
- <flag name="dc1394">Enables IIDC cameras support.</flag>
- <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
- <flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
- <flag name="directx">Enable Win32 DirectX support.</flag>
- <flag name="dshow">Enables Win32 DirectShow support.</flag>
- <flag name="dxva2">Enables Win32 DxVA2 support.</flag>
- <flag name="egl">Enables EGL video output module.</flag>
- <flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
- <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
- <flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
- <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
- <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
- <flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
- <flag name="httpd">Enables a web based interface for vlc.</flag>
- <flag name="id3tag">Enables id3tag metadata reader plugin.</flag>
- <flag name="ios-vout">Enables iPhone OS video output.</flag>
- <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
- <flag name="libass">Enables subtitles support using libass.</flag>
- <flag name="libproxy">Enables support for proxy settings in the HTTP access module.</flag>
- <flag name="libv4l">Enables Libv4l Video4Linux support.</flag>
- <flag name="libv4l2">Enables Libv4l2 Video4Linux2 support (for conversion
- from various video formats to standard ones, needed to use v4l2 devices
- with strange formats).</flag>
- <flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins.</flag>
- <flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
- <flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
- <flag name="live">Enables live555 streaming media support (client support for rtsp).</flag>
- <flag name="macosx">Enables Mac OS X gui support.</flag>
- <flag name="macosx-audio">Enables Mac OS X audio module.</flag>
- <flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
- <flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
- <flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
- <flag name="macosx-qtcapture">Enables Mac OS X qtcapture (iSight) module.</flag>
- <flag name="macosx-vout">Enables Mac OS X video output module.</flag>
- <flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
- <flag name="media-library">Build the (sqlite based) media library.</flag>
- <flag name="neon">Enables NEON optimizations for arm processors.</flag>
- <flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
- <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
- <flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
- <flag name="projectm">Enables the projectM visualization plugin.</flag>
- <flag name="pvr">Enables PVR cards access module.</flag>
- <flag name="qt4" restrict=">=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend. It is now the most up-to-date graphical interface available.</flag>
- <flag name="remoteosd">Enables RemoteOSD plugin (VNC client as video filter).</flag>
- <flag name="rtsp">Enables real audio and RTSP modules.</flag>
- <flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
- <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
- <flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
- <flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
- <flag name="shine">Enables shine fixed point mp3 encoder.</flag>
- <flag name="shout">Enables libshout output.</flag>
- <flag name="skins">Enables support for the skins2 interface.</flag>
- <flag name="stream">Enables sout module for audio/video data streaming/transcoding/etc..</flag>
- <flag name="switcher">Enables MPEG2 video switcher stream output module.</flag>
- <flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
- <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
- <flag name="upnp">Enables support for Intel UPnP stack.</flag>
- <flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
- <flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
- <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
- <flag name="waveout">Enable win32 waveOut plugin.</flag>
- <flag name="wingdi">Enable Win32 GDI module.</flag>
- <flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
- <flag name="X">Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.</flag>
- <flag name="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
- </use>
-</pkgmetadata>
diff --git a/media-video/vlc/vlc-1.1.13.ebuild b/media-video/vlc/vlc-1.1.13.ebuild
deleted file mode 100644
index c025cc7..0000000
--- a/media-video/vlc/vlc-1.1.13.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.1 2011/12/21 12:18:47 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
- SCM=git-2
- EGIT_BOOTSTRAP="bootstrap"
- if [ "${PV%.9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
- else
- EGIT_REPO_URI="git://git.videolan.org/vlc.git"
- fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-VLC_SNAPSHOT_TIME="0013"
-
-PATCHLEVEL="105"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
- SRC_URI=""
-elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
- SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
- MY_P="${P/_alpha*/}-git"
-elif [[ "${MY_P}" == "${P}" ]]; then
- SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-else
- SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
-fi
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-else
- KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
- debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
- +gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
- libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
- modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
- png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
- schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
- svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
- vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
- || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
- >=media-libs/libdvbpsi-0.1.6
- a52? ( >=media-libs/a52dec-0.7.4-r3 )
- aalib? ( media-libs/aalib x11-libs/libX11 )
- aac? ( >=media-libs/faad2-2.6.1 )
- alsa? ( >=media-libs/alsa-lib-1.0.23 )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- bidi? ( >=dev-libs/fribidi-0.10.4 )
- cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
- dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
- dirac? ( >=media-video/dirac-0.10.0 )
- directfb? ( dev-libs/DirectFB sys-libs/zlib )
- dts? ( media-libs/libdca )
- dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
- fluidsynth? ( media-sound/fluidsynth )
- fontconfig? ( media-libs/fontconfig )
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
- ggi? ( media-libs/libggi )
- gme? ( media-libs/game-music-emu )
- gnome? ( gnome-base/gnome-vfs )
- gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
- id3tag? ( media-libs/libid3tag sys-libs/zlib )
- ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
- kate? ( >=media-libs/libkate-0.1.1 )
- libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
- libcaca? ( >=media-libs/libcaca-0.99_beta14 )
- libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
- libproxy? ( net-libs/libproxy )
- libtiger? ( media-libs/libtiger )
- lirc? ( app-misc/lirc )
- live? ( >=media-plugins/live-2008.07.06 )
- lua? ( >=dev-lang/lua-5.1 )
- matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
- modplug? ( >=media-libs/libmodplug-0.8.8.1 )
- mp3? ( media-libs/libmad )
- mpeg? ( >=media-libs/libmpeg2-0.3.2 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- musepack? ( >=media-sound/musepack-tools-444 )
- ncurses? ( sys-libs/ncurses )
- nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2 )
- x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
- ogg? ( media-libs/libogg )
- opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
- png? ( media-libs/libpng sys-libs/zlib )
- projectm? ( media-libs/libprojectm )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
- qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
- remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
- schroedinger? ( >=media-libs/schroedinger-1.0.10 )
- sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11
- sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
- shout? ( media-libs/libshout )
- skins? (
- x11-libs/qt-gui:4 x11-libs/qt-core:4
- x11-libs/libXext x11-libs/libX11
- media-libs/freetype media-fonts/dejavu
- )
- speex? ( media-libs/speex )
- sqlite? ( >=dev-db/sqlite-3.6.0:3 )
- svg? ( >=gnome-base/librsvg-2.9.0 )
- svga? ( media-libs/svgalib )
- taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
- theora? ( >=media-libs/libtheora-1.0_beta3 )
- truetype? ( media-libs/freetype virtual/ttf-fonts
- !fontconfig? ( media-fonts/dejavu ) )
- twolame? ( media-sound/twolame )
- udev? ( >=sys-fs/udev-142 )
- upnp? ( net-libs/libupnp )
- v4l? (
- libv4l2? ( media-libs/libv4l )
- libv4l? ( media-libs/libv4l )
- )
- vaapi? ( x11-libs/libva virtual/ffmpeg )
- vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
- vorbis? ( media-libs/libvorbis )
- win32codecs? ( media-libs/win32codecs )
- X? ( x11-libs/libX11 )
- x264? ( >=media-libs/x264-0.0.20090923 )
- xcb? ( x11-libs/libxcb x11-libs/xcb-util )
- xml? ( dev-libs/libxml2 )
- xosd? ( x11-libs/xosd x11-libs/libX11 )
- zvbi? ( >=media-libs/zvbi-0.2.25 )
- "
-
-DEPEND="${RDEPEND}
- !!<=media-video/vlc-1.0.99999
- alsa? ( >=media-sound/alsa-headers-1.0.23 )
- dvb? ( sys-kernel/linux-headers )
- kde? ( >=kde-base/kdelibs-4 )
- v4l? ( >=sys-kernel/linux-headers-2.6.25 )
- xcb? ( x11-proto/xproto )
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# Displays a warning if the first use flag is set but the second is not
-vlc_use_needs() {
- use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
-}
-
-# Notify the user that some useflag have been forced on
-vlc_use_force() {
- use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
-}
-
-# Use when $1 depends strictly on $2
-# if use $1 then enable $2
-vlc_use_enable_force() {
- use $1 && echo "--enable-$2"
-}
-
-pkg_setup() {
- # Useflags we need to forcefuly enable
- vlc_use_force remoteosd gcrypt
- vlc_use_force gnutls gcrypt
- vlc_use_force skins truetype
- vlc_use_force skins qt4
- vlc_use_force vlm stream
- vlc_use_force vaapi ffmpeg
- vlc_use_force nsplugin xcb
- vlc_use_force xosd X
- vlc_use_force sdl X
- vlc_use_force aalib X
-
- # Useflags that will be automagically discarded if deps are not met
- vlc_use_needs bidi truetype
- vlc_use_needs cddb cdda
- vlc_use_needs fontconfig truetype
- vlc_use_needs libv4l2 v4l
- vlc_use_needs libv4l v4l
- vlc_use_needs libtiger kate
- vlc_use_needs xv xcb
-
- if use qt4 || use skins ; then
- qt4_pkg_setup
- else
- ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
- ewarn "graphical interface. Maybe that is not what you want..."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- if [ "${PV%9999}" != "${PV}" ] ; then
- git-2_src_unpack
- fi
-}
-
-src_prepare() {
- # Make it build with libtool 1.5
- rm -f m4/lt* m4/libtool.m4
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}"/0001-Support-building-against-NPAPI-SDK.patch
- eautoreconf
-}
-
-src_configure() {
-
- # It would fail if -fforce-addr is used due to too few registers...
- use x86 && filter-flags -fforce-addr
-
- econf \
- $(use_enable a52) \
- $(use_enable aalib aa) \
- $(use_enable aac faad) \
- $(use_enable alsa) \
- $(use_enable altivec) \
- --disable-asademux \
- $(use_enable atmo) \
- $(use_enable avahi bonjour) \
- $(use_enable bidi fribidi) \
- $(use_enable cdda vcd) \
- $(use_enable cddb libcddb) \
- $(use_enable dbus) $(use_enable dbus dbus-control) \
- $(use_enable dirac) \
- $(use_enable directfb) \
- $(use_enable dc1394) \
- $(use_enable debug) \
- $(use_enable dts dca) \
- $(use_enable dvb) \
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
- $(use_enable fbcon fb) \
- $(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
- $(use_enable flac) \
- $(use_enable fluidsynth) \
- $(use_enable fontconfig) \
- $(use_enable ggi) \
- $(use_enable gme) \
- $(use_enable gnome gnomevfs) \
- $(use_enable gnutls) \
- $(use_enable httpd) \
- $(use_enable id3tag) \
- $(use_enable ieee1394 dv) \
- $(use_enable jack) \
- $(use_enable kate) \
- $(use_with kde kde-solid) \
- $(use_enable libass) \
- $(use_enable libcaca caca) \
- $(use_enable gcrypt libgcrypt) \
- $(use_enable libnotify notify) \
- $(use_enable libproxy) \
- --disable-libtar \
- $(use_enable libtiger tiger) \
- $(use_enable libv4l) \
- $(use_enable libv4l2) \
- $(use_enable lirc) \
- $(use_enable live live555) \
- $(use_enable lua) \
- $(use_enable matroska mkv) \
- $(use_enable mmx) \
- $(use_enable modplug mod) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable mtp) \
- $(use_enable musepack mpc) \
- $(use_enable ncurses) \
- $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
- $(use_enable ogg) \
- $(use_enable opengl glx) $(use_enable opengl) \
- $(use_enable optimisememory optimize-memory) \
- $(use_enable oss) \
- $(use_enable png) \
- --disable-portaudio \
- $(use_enable projectm) \
- $(use_enable pulseaudio pulse) \
- $(use_enable pvr) \
- $(use_enable qt4) \
- $(use_enable remoteosd) \
- $(use_enable rtsp realrtsp) \
- $(use_enable run-as-root) \
- $(use_enable samba smb) \
- $(use_enable schroedinger) \
- $(use_enable sdl) \
- $(use_enable sdl-image) \
- $(use_enable shine) \
- $(use_enable shout) \
- $(use_enable skins skins2) \
- $(use_enable speex) \
- $(use_enable sqlite) \
- $(use_enable sse) \
- $(use_enable stream sout) \
- $(use_enable svg) \
- $(use_enable svga svgalib) \
- $(use_enable taglib) \
- $(use_enable theora) \
- $(use_enable truetype freetype) \
- $(use_enable twolame) \
- $(use_enable udev) \
- $(use_enable upnp) \
- --disable-v4l \
- $(use_enable v4l v4l2) \
- $(use_enable vcdx) \
- $(use_enable vaapi libva) \
- $(use_enable vlm) \
- $(use_enable vorbis) \
- $(use_enable win32codecs loader) \
- $(use_enable wma-fixed) \
- $(use_with X x) \
- $(use_enable x264) \
- $(use_enable xcb) \
- $(use_enable xml libxml2) \
- $(use_enable xosd) \
- $(use_enable xv xvideo) \
- $(use_enable zvbi) $(use_enable !zvbi telx) \
- --disable-snapshot \
- --disable-growl \
- --disable-optimizations \
- --enable-fast-install \
- $(vlc_use_enable_force vlm sout) \
- $(vlc_use_enable_force skins qt4) \
- $(vlc_use_enable_force skins freetype) \
- $(vlc_use_enable_force remoteosd libgcrypt) \
- $(vlc_use_enable_force gnutls libgcrypt) \
- $(vlc_use_enable_force vaapi avcodec) \
- $(vlc_use_enable_force nsplugin xcb) \
- $(use sdl && echo '--with-x') \
- $(use xosd && echo '--with-x') \
- $(use aalib && echo '--with-x')
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS HACKING THANKS NEWS README \
- doc/fortunes.txt doc/intf-vcd.txt
-
- rm -rf "${D}/usr/share/doc/vlc" \
- "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
-
- if use nsplugin; then
- dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
- mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
- "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
- fi
-
- use skins || rm -rf "${D}/usr/share/vlc/skins2"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
- einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
- else
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
- ewarn "If you do not do it, vlc will take a long time to load."
- fi
-}
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
deleted file mode 100644
index 7af9db6..0000000
--- a/x11-libs/cairo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18
-AUX cairo-1.10.2-qt-surface.patch 2687 RMD160 9ffc2924070a7dfa917a2b05b11de1fcca571dab SHA1 6ce6a6047d6f8420ea3044d036e7d10c6ac98c61 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd
-AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
-DIST cairo-1.11.2.tar.gz 25782963 RMD160 e5dd2bc36469add524b6ac8b37a7d0127c81c4bc SHA1 40b9e1066fcd33c2aeecd800764b1aa5a0ac7bde SHA256 dcd7d0b982e1db6787a4a07ac9d99aa7db0ce22abbf59d676e211310a4059126
-EBUILD cairo-1.11.2.ebuild 4165 RMD160 9c96c127a135dce604c7599d2678602ebe9c9247 SHA1 eda577633c82c8ee5311ac36c3f761fa0c63a88e SHA256 dff11c52b5e51fb8bd9dfed47ae4b5652d3beeb96ef7676c4375b1dfef95edbd
diff --git a/x11-libs/cairo/cairo-1.11.2.ebuild b/x11-libs/cairo/cairo-1.11.2.ebuild
deleted file mode 100644
index 9a4dbbb..0000000
--- a/x11-libs/cairo/cairo-1.11.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.13 2011/07/13 09:05:48 mduft Exp $
-
-EAPI=3
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
-
-inherit eutils flag-o-matic autotools ${GIT_ECLASS}
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0
- sys-libs/zlib
- >=x11-libs/pixman-0.18.4
- directfb? ( dev-libs/DirectFB )
- glib? ( dev-libs/glib:2 )
- opengl? ( virtual/opengl )
- openvg? ( media-libs/mesa[gallium] )
- qt4? ( >=x11-libs/qt-gui-4.4:4 )
- svg? ( dev-libs/libxml2 )
- X? (
- >=x11-libs/libXrender-0.6
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXft
- drm? (
- >=sys-fs/udev-136
- gallium? ( media-libs/mesa[gallium] )
- )
- )
- xcb? (
- x11-libs/libxcb
- x11-libs/xcb-util
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
- doc? (
- >=dev-util/gtk-doc-1.6
- ~app-text/docbook-xml-dtd-4.2
- )
- X? (
- x11-proto/renderproto
- drm? (
- x11-proto/xproto
- >=x11-proto/xextproto-7.1
- )
- )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
- epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
- epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
-
- # Slightly messed build system YAY
- if [[ ${PV} == *9999* ]]; then
- touch boilerplate/Makefile.am.features
- touch src/Makefile.am.features
- touch ChangeLog
- fi
-
- # We need to run elibtoolize to ensure correct so versioning on FreeBSD
- # upgraded to an eautoreconf for the above interix patch.
- eautoreconf
-}
-
-src_configure() {
- local myopts
-
- # SuperH doesn't have native atomics yet
- use sh && myopts+=" --disable-atomic"
-
- [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
- # tracing fails to compile, because Solaris' libelf doesn't do large files
- [[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
-
- # 128-bits long arithemetic functions are missing
- [[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
- #gets rid of fbmmx.c inlining warnings
- append-flags -finline-limit=1200
-
- if use X; then
- myopts+="
- --enable-tee=yes
- $(use_enable drm)
- "
-
- if use drm; then
- myopts+="
- $(use_enable gallium)
- $(use_enable xcb xcb-drm)
- "
- else
- use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
- myopts+="
- --disable-gallium
- --disable-xcb-drm
- "
- fi
- else
- use drm && ewarn "drm use requires X use enabled. So disabling for now."
- myopts+="
- --disable-drm
- --disable-gallium
- --disable-xcb-drm
- "
- fi
-
- # --disable-xcb-lib:
- # do not override good xlib backed by hardforcing rendering over xcb
- econf \
- --disable-dependency-tracking \
- $(use_with X x) \
- $(use_enable X xlib) \
- $(use_enable X xlib-xrender) \
- $(use_enable aqua quartz) \
- $(use_enable aqua quartz-image) \
- $(use_enable debug test-surfaces) \
- $(use_enable directfb) \
- $(use_enable glib gobject) \
- $(use_enable doc gtk-doc) \
- $(use_enable openvg vg) \
- $(use_enable opengl gl) \
- $(use_enable qt4 qt) \
- $(use_enable static-libs static) \
- $(use_enable svg) \
- $(use_enable xcb) \
- $(use_enable xcb xcb-shm) \
- --enable-ft \
- --enable-pdf \
- --enable-png \
- --enable-ps \
- --disable-xlib-xcb \
- ${myopts}
-}
-
-src_install() {
- # parallel make install fails
- emake -j1 DESTDIR="${D}" install || die
- find "${ED}" -name '*.la' -exec rm -f {} +
- dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index a58c2f8..0000000
--- a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch
-http://bugs.gentoo.org/336696
-
---- src/cairo-xlib-display.c
-+++ src/cairo-xlib-display.c
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
-
diff --git a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch
deleted file mode 100644
index cf0b57a..0000000
--- a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp cairo-1.10.2/src/cairo-qt-surface.cpp
---- cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp 2010-12-25 15:21:34.000000000 +0100
-+++ cairo-1.10.2/src/cairo-qt-surface.cpp 2011-12-20 22:59:30.000000000 +0100
-@@ -61,7 +61,9 @@
- #include <QtGui/QX11Info>
- #include <QtCore/QVarLengthArray>
-
--#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
-+#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0))
-+#include <QtGui/QGlyphRun>
-+#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
- extern void qt_draw_glyphs(QPainter *, const quint32 *glyphs, const QPointF *positions, int count);
- #endif
-
-@@ -1370,7 +1372,39 @@
- cairo_clip_t *clip,
- int *remaining_glyphs)
- {
--#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
-+#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) && !defined(QT_NO_RAWFONT)
-+ cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface;
-+
-+ // pick out the colour to use from the cairo source
-+ cairo_solid_pattern_t *solid = (cairo_solid_pattern_t*) source;
-+ // documentation says you have to freeze the cache, but I don't believe it
-+ _cairo_scaled_font_freeze_cache(scaled_font);
-+
-+ QColor tempColour(solid->color.red * 255, solid->color.green * 255, solid->color.blue * 255);
-+ QVector<QPointF> positions(num_glyphs);
-+ QVector<unsigned int> glyphss(num_glyphs);
-+ FT_Face face = cairo_ft_scaled_font_lock_face (scaled_font);
-+ const FT_Size_Metrics& ftMetrics = face->size->metrics;
-+ QFont font(face->family_name);
-+ font.setStyleStrategy(QFont::NoFontMerging);
-+ font.setBold(face->style_flags & FT_STYLE_FLAG_BOLD);
-+ font.setItalic(face->style_flags & FT_STYLE_FLAG_ITALIC);
-+ font.setKerning(face->face_flags & FT_FACE_FLAG_KERNING);
-+ font.setPixelSize(ftMetrics.y_ppem);
-+ cairo_ft_scaled_font_unlock_face(scaled_font);
-+ qs->p->setFont(font);
-+ qs->p->setPen(tempColour);
-+ for (int currentGlyph = 0; currentGlyph < num_glyphs; currentGlyph++) {
-+ positions.append(QPointF(glyphs[currentGlyph].x, glyphs[currentGlyph].y));
-+ glyphss.append(glyphs[currentGlyph].index);
-+ }
-+ QGlyphRun qglyphs;
-+ qglyphs.setGlyphIndexes(glyphss);
-+ qglyphs.setPositions(positions);
-+ qs->p->drawGlyphRun(QPointF(), qglyphs);
-+ _cairo_scaled_font_thaw_cache(scaled_font);
-+ return CAIRO_INT_STATUS_SUCCESS;
-+#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT)
- cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface;
-
- // pick out the colour to use from the cairo source
diff --git a/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/x11-libs/cairo/files/cairo-1.8.8-interix.patch
deleted file mode 100644
index dc20714..0000000
--- a/x11-libs/cairo/files/cairo-1.8.8-interix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools
---- cairo-1.8.8.orig/build/configure.ac.tools 2009-09-30 13:36:42 +0200
-+++ cairo-1.8.8/build/configure.ac.tools 2009-09-30 13:50:50 +0200
-@@ -21,5 +21,12 @@
- *) PKGCONFIG_REQUIRES="Requires.private"; ;;
- esac
-
-+dnl hmm... on interix, things go really bad with Requires.private, since libpng12
-+dnl is missing on the final link commands, so gtk+'s configure checks for cairo
-+dnl fail miserably with unresolved symbols to it.
-+case "$host_os" in
-+interix*) PKGCONFIG_REQUIRES="Requires" ;;
-+esac
-+
- AC_SUBST(PKGCONFIG_REQUIRES)
-
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
deleted file mode 100644
index 1025057..0000000
--- a/x11-libs/pixman/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pixman-0.24.2.tar.bz2 467979 RMD160 985a64799ba4b7240248807e7a691c3e9824ee3d SHA1 233eed3cd16ee1b2a842140477503d2c68b74418 SHA256 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
-EBUILD pixman-0.24.2.ebuild 1665 RMD160 cb54d17ffbb4c5d6ce99103ef67217f25e38d3af SHA1 fc0b5cf97b0f64ecd1d6de73beaf6871215a651a SHA256 cdc5ceea4604928eee2f3feb8d6f4e8a2b2586351c54a6d79536d3aad871f6af
diff --git a/x11-libs/pixman/pixman-0.24.2.ebuild b/x11-libs/pixman/pixman-0.24.2.ebuild
deleted file mode 100644
index cfbe342..0000000
--- a/x11-libs/pixman/pixman-0.24.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.24.0.ebuild,v 1.6 2011/12/27 21:05:34 maekke Exp $
-
-EAPI=4
-inherit xorg-2 toolchain-funcs versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
-DESCRIPTION="Low-level pixel manipulation routines"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="altivec iwmmxt mmx neon sse2"
-
-XORG_EAUTORECONF="yes"
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- local enable_mmx="$(use mmx && echo 1 || echo 0)"
- local enable_sse2="$(use sse2 && echo 1 || echo 0)"
-
- # this block fixes bug #260287
- if use x86; then
- if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
- ewarn "SSE2 instructions require GCC 4.2 or higher."
- ewarn "pixman will be built *without* SSE2 support"
- enable_sse2="0"
- fi
- fi
-
- local confadd
- # this block fixes bug #236558
- case "$enable_mmx,$enable_sse2" in
- '1,1')
- confadd=(--enable-mmx --enable-sse2) ;;
- '1,0')
- confadd=(--enable-mmx --disable-sse2) ;;
- '0,1')
- ewarn "You enabled SSE2 but have MMX disabled. This is an invalid."
- ewarn "pixman will be built *without* MMX/SSE2 support."
- confadd=(--disable-mmx --disable-sse2) ;;
- '0,0')
- confadd=(--disable-mmx --disable-sse2) ;;
- esac
-
- XORG_CONFIGURE_OPTIONS=(
- "${confadd[@]}"
- $(use_enable altivec vmx)
- $(use_enable neon arm-neon)
- $(use_enable iwmmxt arm-iwmmxt)
- --disable-gtk
- )
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-04 19:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-04 19:35 [gentoo-commits] proj/mozilla:master commit in: x11-libs/pixman/, x11-libs/cairo/, x11-libs/cairo/files/, media-video/vlc/files/, Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox