diff options
Diffstat (limited to 'media-libs')
72 files changed, 984 insertions, 2328 deletions
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild index 288a03fabf..4e127b07ec 100644 --- a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild @@ -34,6 +34,7 @@ pkg_setup() { src_prepare() { find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die + epatch "${FILESDIR}"/${P}-cross-compile.patch # https://bugs.gentoo.org/509886 use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; } epatch_user diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch new file mode 100644 index 0000000000..11fd99a2f9 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch @@ -0,0 +1,46 @@ +fix from upstream + +From c82417650a1ea4446c19dd82bfab9d8e6cd5a969 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Sep 2015 18:48:02 +0300 +Subject: [PATCH] build: Do not try to detect cross-compiler + +cross compilers are passed via path may not be a gcc based cross +compiler in such cases this check fails and try's to force gcc based +cross compiler detection, This code is a convenience that limits the +build system + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + configure.ac | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a482b3e..a14e52d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr) + + dnl Checks for programs. + +-dnl try to gues cross-compiler if not set +-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`"; +-then +- AC_MSG_CHECKING(for cross-compiler) +- +- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc +- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \ +- && CC=${host_cpu}-${host_os}-gcc +- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \ +- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc +- +- AC_MSG_RESULT($CC) +-fi +- + CFLAGS="$CFLAGS -D_GNU_SOURCE" + + +-- +2.5.2 + diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest index c1bc6e8110..12c6522aa1 100644 --- a/media-libs/clutter-gst/Manifest +++ b/media-libs/clutter-gst/Manifest @@ -1,3 +1,3 @@ DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb DIST clutter-gst-3.0.10.tar.xz 391424 SHA256 2dbdbc3292e92684bbdbf1694c61f6b781f5810e4d79a415dfdee2f7ee42148c SHA512 e1ab8e57bade63c076c1426ed3b87d20034ff8fb54146c754ec4b990ec6d2102c4d87a1b1c3c9def17abe6985e2a59e44253cae1053f64a779dc8ef71a2951e7 WHIRLPOOL 5f8fba3a49c268650cdfee6d0959202a19288042f09acebdc3457f138193fae27fd0074a478032d8773446e05df3f0214e2038ea77feb90a6ea6046d7e361c86 -DIST clutter-gst-3.0.8.tar.xz 390628 SHA256 582e85b88482e16f7ec719363e38fadf84fab4d4baaa21e5227a454b824f135c SHA512 37960b676d440f879fbda8b14b0d3d6974527354abc1368fa2353793eff2ef4c6b4f50b6259b0016b22ae787d022c371aa512ad4441f6217e54ee35089be8b3a WHIRLPOOL 485d00ba7fcea8c7f92aaf7c56aaaa4e022c790b6941ec317314195b2f64766ded8a7acc1673951d871e1523ccccb4fe9761b50a432eeaaf25afffb2d7abf8a8 +DIST clutter-gst-3.0.12.tar.xz 390880 SHA256 cd2b2f8db9c21d6295ed0b2811d4c3036fac5796be71d7affdb2b8746f12066c SHA512 4ad92dfcc7c3d0b83c90a7a216267b86899f2206c8e4405f57ecb08b66e4380c3154d289954c6f60093f47f1a8aa44a2269f41b3e666cf19684fa2d92afdc0c9 WHIRLPOOL ceb2870e52f277812de53d65dbef354b9652fd719184cb8ba25e4ccdea0acd448a76bb2b3a406a93b14b3bb57ac65ffbe3461e00a35c6bb12300c04954a4304a diff --git a/media-libs/clutter-gst/clutter-gst-3.0.8.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild index 22cc272fec..31518c7e63 100644 --- a/media-libs/clutter-gst/clutter-gst-3.0.8.ebuild +++ b/media-libs/clutter-gst/clutter-gst-3.0.12.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 ) inherit gnome2 python-any-r1 -HOMEPAGE="http://www.clutter-project.org/" +HOMEPAGE="https://blogs.gnome.org/clutter/" DESCRIPTION="GStreamer integration library for Clutter" LICENSE="LGPL-2.1+" diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild index 8be0281485..43a592eb2b 100644 --- a/media-libs/devil/devil-1.7.8-r2.ebuild +++ b/media-libs/devil/devil-1.7.8-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86" IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs tiff xpm X" RDEPEND="allegro? ( media-libs/allegro:0 ) @@ -38,7 +38,7 @@ DEPEND="${RDEPEND} X? ( x11-proto/xextproto )" src_prepare() { - epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch + epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch eautoreconf } diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch b/media-libs/devil/files/devil-1.7.8-fix-test.patch new file mode 100644 index 0000000000..44af2fc71d --- /dev/null +++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch @@ -0,0 +1,10 @@ +--- a/devil-1.7.8/test/Makefile.am ++++ b/devil-1.7.8/test/Makefile.am +@@ -12,5 +12,6 @@ else + testil_LDADD += ../lib/libIL.la + endif + +-TESTS_ENVIRONMENT = /bin/bash ++TESTS_ENVIRONMENT = + TESTS = $(check_SCRIPTS) ++LOG_COMPILER = $(SHELL) diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest index 29e179894e..d6eb64bb15 100644 --- a/media-libs/elementary/Manifest +++ b/media-libs/elementary/Manifest @@ -2,3 +2,4 @@ DIST elementary-1.12.2.tar.bz2 16726431 SHA256 c6aa5e83224400babdd2a6ed848eeb09a DIST elementary-1.13.1.tar.xz 16120080 SHA256 11595b6c5f511150a26e970bf8e590f96a6ce9e33e5dd8419407013844b2b74f SHA512 b8d4e3ff2447a80a98119753012e6ef0666ca569e4d401e66477a51667b6e940eb9c02d87f37b289b257db2855fc35486f0229e8861e74b6c48366aac30caa9f WHIRLPOOL 5400f9a11f2997fde9ee7b170ccf6b8833ad0fdecf229fc2dcbb9eea731e40958922672b47fa539df533006b29f7a197473cb3b24b8bac51a4159fc9f249ec46 DIST elementary-1.15.0.tar.xz 18430880 SHA256 2be3180acbb9fa2fc0e9351b5508318925eb38733a6d54e1b3fc75e58368f1b0 SHA512 5441ebc012cf76aad074d25394cbb855decabcefa5a8b5feb2909a4fbc470fad32b1660fbc0bd47f6c11267d11cb21fe9df283718d4ccf68ffe44319de229781 WHIRLPOOL 29aa20103a56bd527754f14841216f0c6198e2663836455cc8b6391a88ca558c632f15868b948059616e659fd7c43f797526a472cba26ba38bc5195f562fbb3c DIST elementary-1.15.1.tar.xz 18514596 SHA256 ab22a40a5108f7f988a34b0a791d202d2c6c538ea8508919c264bdbdce11ab04 SHA512 1622eb3e54f716b84642c9fe2164c882749fe402cf516e070a47c6d0cff898d043e231e3f557984e6d2fff90bf218249431b148d209bc1ed1aacb35211364ba6 WHIRLPOOL 4b224a54a11d5e8907b53f8d71ef541ff93fa92a1a7e24ec567312d6fb3c7c0c31358a1ace2b66c227447ffef3c94f7b373da78c694e09d9d3f67f888d641f96 +DIST elementary-1.15.2.tar.xz 18514048 SHA256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f SHA512 7ee796898aee7667e0ae6e8e7d1a604287fc9b009a7a3f4ab75c15b10160e0a38975dfbf6586c20ad2fdc8075dd867287d4d5617ad6b6be2e522c74beb03ce38 WHIRLPOOL 6d42e6063c8d697d237b003781f33e6b3bf562c2785458cd3cf1cf84319325ac1ff39704e33bae641610b1ff669b2fe115135a5f939eca0314a25ee7a6a6bf0a diff --git a/media-libs/elementary/elementary-1.15.2.ebuild b/media-libs/elementary/elementary-1.15.2.ebuild new file mode 100644 index 0000000000..7cef5b0667 --- /dev/null +++ b/media-libs/elementary/elementary-1.15.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +MY_P=${P/_/-} + +if [[ "${PV}" == "9999" ]] ; then + EGIT_SUB_PROJECT="core" + EGIT_URI_APPEND="${PN}" +else + SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz" + EKEY_STATE="snap" +fi + +inherit enlightenment + +DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices" +HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary" + +LICENSE="LGPL-2.1" +IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs" + +DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_configure() { + E_ECONF=( + $(use_enable debug) + $(use_enable doc) + --disable-ecore-cocoa + --disable-ecore-psl1ght + --disable-ecore-win32 + --disable-elocation + --disable-emap + --disable-eweather + # broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'. Stop + #$(use_enable examples build-examples) + $(use_enable examples install-examples) + $(use_enable fbcon ecore-fb) + $(use_enable sdl ecore-sdl) + $(use_enable wayland ecore-wayland) + $(use_enable X ecore-x) + $(use_enable quicklaunch quick-launch) + ) + + enlightenment_src_configure +} diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index bd0b270d80..e7ce7fb53c 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,8 +1,12 @@ +DIST 03-infinality-2.6-2015.10.04.patch.xz 24444 SHA256 0c28892e9b6bc27afe9149da04fc9733c9323817dd81802f2f40c680a7f887a8 SHA512 8733a7c7c118dee7fd2303435fc9c10d66aba49bd16f1215fe069b5cf16242776f2701c02fa17bca772195f0fc569e35cff11f73fc5f77519d4858737d511db3 WHIRLPOOL 5e7fbbea273df890efe8a101106430bba54cf3ce52228cb3eb272302189397bc25b4451a9bfb4e8ba56413c39c9cd21bc1df9896f0232dd1825aad51fabc045d DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e19c3741993ee0ff787984aa0653ca66814e05ef195f SHA512 8831e3337214cc57a0381c56ef6750f85b11f1b6358adaa3dda34d449f234335bede124be9d23df817ae8c06f80c8e3ce63ed3fc32eb05586b8c8e43ce52e575 WHIRLPOOL 27b945e9524e984ef57f96415a86095d91dea8fa8e402a3eb6a3d7c38a7636d53d5e47fc37b734ca88f41a499f3398ab9d7bd147e1424c19b09f41e17f2cbe8d DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158 DIST freetype-2.6-infinality-patches.tar.xz 24356 SHA256 95bd7f6bd191063e4691e000b1f59aa776a6c0afb5501e19a88d7b72ec47831e SHA512 87e206ffe78b9411753c0491da9ef6bbea4f9dde45cba539f0d51e9c5c4461c94b75af8fc8b96b9b9d5c7d7c63ac1ec88c227e93db197c56e02ead60b502d9a0 WHIRLPOOL 3d671e637ed4f1b7adfa862be684f8513d58e7071ce7ef1e26ca3a4311c0ec5e1817409299f0266129fe0b2c2bd330fdf6e6894e05ef937ba94c95b6e860dcd0 +DIST freetype-2.6.1.tar.bz2 1744692 SHA256 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 SHA512 cbc003e8f353d47ddcc2110aa8ecfdc1df53e61698e1ed68ed60afd5fd1d10d921c9719a505196c95865a68482822f9cccf5d131ec36d64c0230def774e7bb4b WHIRLPOOL 6319c8764f8d29669b241f0152338d356761d65a75235544c0c831aa03700e8b663b40b501519e57f09968c98bc8d56d1005ad069c9ee066c679b3400e20779a DIST freetype-2.6.tar.bz2 1726219 SHA256 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e SHA512 0242c832dcac3d9dc5d434b7f5145e63f2289d5df32f16e1c7afc1e31c3c92f0dd374e20dfef79a9ecb26b14419f42b0d897c7154f249f629c35ee7af0aa5297 WHIRLPOOL bf7f105b74348a1ca0e95e21091670a5d73793e8aea8aa8e0dad515086885a182f3bced713c2cf76704c7814031f308a642d6db45a0c065627d0e7bdcaedffd6 DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f +DIST freetype-doc-2.6.1.tar.bz2 477313 SHA256 69b1102c9f4e7d75ad2701618f7e5c084d819264755ecbf11893e3cc6de0e0f5 SHA512 8353c5324166004f8e65c92bbe9be567c7ed2681b0c125758df8be098cd51983016a1387d58b147c2d57c984fcd0a615fe580e38d6e0ed445c5781e28c7c77b3 WHIRLPOOL c1f9f27db8975d89f91c8fff4ed523536525747bf57d116d5dd220986370287e8b05a4678fe31cbb0c08461cd9a49cbd6d9d05769d22a03220227c40baed2359 DIST freetype-doc-2.6.tar.bz2 477177 SHA256 4868ec0b2b6890a1db296b00ce302ebf311b93b08aabd7ffca902e9c16b3e470 SHA512 ca8e5c44ac912c939e891b1e3386852d1771806f1f5684429964a6bac284d5cb51e80645a4b492067ad8c46e0e91d1651e8f593b3d5c03c5bceeaec1c51b6b15 WHIRLPOOL e02cb2b4382aabfd0ed48a8e652467bc11dee0a7b7591a5d3755012f903218c5ed3030ee3eb9888393cc9bad52585687e7794f82883fdf1d64835a87c27c2cd2 DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930 +DIST ft2demos-2.6.1.tar.bz2 190308 SHA256 369d27ae65ba04c2e3e74cf948ebcc5aa51abd47cd2e1d7d5cad0bc1f82da2aa SHA512 9740e1ae7fa4f8a932de3766dc8512c22a847d606b99aaff568865a68e059b3970ca9708d6c17f4d171f6f9bb63194f2c3498adf5461e3233b3b3206c57c6d7e WHIRLPOOL 84d59e27300085e4551f622374d0080184f0180d4b3c9447492af906612c7da3cfb3bf66e8f038c3fa008c2d590d7956fc4a2d347190d45b028c729949182b69 DIST ft2demos-2.6.tar.bz2 190240 SHA256 f8f4bc2a2e76e0dbe61838e452c5a7daf1d4bd9dfa44691940bf308f776d32b6 SHA512 f9b8dfe40266ffdd2927e0d2cfe641b9028de07935d0abcd0a2dadcf0359700c296cd2a9b0c4114f47c0cd1489db287224a31b7dbcb1f6b937b1bdfcda3c1db8 WHIRLPOOL 400796659c523f4c2c16c8c523161cbf34505be5a08d1eb601312362cf0eb226fa86561d199d34f0e1a9e83bd76525663e9a040865f456bfa3ed49b64d51720d diff --git a/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch new file mode 100644 index 0000000000..c361baf2a0 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.6.1-bad-shift.patch @@ -0,0 +1,50 @@ +taken from upstream + +http://savannah.nongnu.org/bugs/?func=detailitem&item_id=46118 + +From 30fe5e762e062612fdf4b56b50d813525a5aa311 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl@gnu.org> +Date: Sun, 4 Oct 2015 13:08:08 +0200 +Subject: [PATCH] [base] Replace left shifts with multiplication (#46118). + +* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it. +--- + ChangeLog | 6 ++++++ + src/base/ftglyph.c | 14 +++++++------- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c +index cb7fc37..2778743 100644 +--- a/src/base/ftglyph.c ++++ b/src/base/ftglyph.c +@@ -125,10 +125,10 @@ + FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph; + + +- cbox->xMin = glyph->left << 6; +- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 ); +- cbox->yMax = glyph->top << 6; +- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 ); ++ cbox->xMin = glyph->left * 64; ++ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 ); ++ cbox->yMax = glyph->top * 64; ++ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 ); + } + + +@@ -403,9 +403,9 @@ + if ( error ) + goto Exit; + +- /* copy advance while converting it to 16.16 format */ +- glyph->advance.x = slot->advance.x << 10; +- glyph->advance.y = slot->advance.y << 10; ++ /* copy advance while converting 26.6 to 16.16 format */ ++ glyph->advance.x = slot->advance.x * 1024; ++ glyph->advance.y = slot->advance.y * 1024; + + /* now import the image from the glyph slot */ + error = clazz->glyph_init( glyph, slot ); +-- +2.5.2 + diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.1-r1.ebuild new file mode 100644 index 0000000000..de89f3921c --- /dev/null +++ b/media-libs/freetype/freetype-2.6.1-r1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools-multilib flag-o-matic multilib toolchain-funcs + +INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch" + +DESCRIPTION="A high-quality and portable font engine" +HOMEPAGE="http://www.freetype.org/" +SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 + mirror://nongnu/freetype/${P/_/}.tar.bz2 + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 + mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 ) + infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )" + +LICENSE="|| ( FTL GPL-2+ )" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz + infinality png static-libs utils" +RESTRICT="!bindist? ( bindist )" # bug 541408 + +CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) + utils? ( + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] + ) + )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" + +src_prepare() { + enable_option() { + sed -i -e "/#define $1/a #define $1" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + # This is the same as the 01 patch from infinality + epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + + if use infinality; then + epatch "${WORKDIR}/${INFINALITY_PATCH}" + + # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11 + enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING + fi + + if ! use bindist; then + # See http://freetype.org/patents.html + # ClearType is covered by several Microsoft patents in the US + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + fi + + if ! use adobe-cff; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 + epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + cd "${S}" || die + fi + + # we need non-/bin/sh to run configure + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ + "${S}"/builds/unix/configure || die + fi + + autotools-utils_src_prepare +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --enable-biarch-config + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + autotools-utils_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils; then + einfo "Building utils" + # fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils; then + einfo "Installing utils" + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die + local ft2demo + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ + "${ED}"/usr/bin || die + done + fi +} + +multilib_src_install_all() { + if use fontforge; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/internal -name '*.h' | \ + while read header; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + use doc && dohtml -r docs/* + + prune_libtool_files --all +} diff --git a/media-libs/freetype/freetype-2.6.1.ebuild b/media-libs/freetype/freetype-2.6.1.ebuild new file mode 100644 index 0000000000..d971b51c5f --- /dev/null +++ b/media-libs/freetype/freetype-2.6.1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools-multilib flag-o-matic multilib toolchain-funcs + +INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch" + +DESCRIPTION="A high-quality and portable font engine" +HOMEPAGE="http://www.freetype.org/" +SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 + mirror://nongnu/freetype/${P/_/}.tar.bz2 + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 + mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 ) + infinality? ( https://dev.gentoo.org/~polynomial-c/${INFINALITY_PATCH}.xz )" + +LICENSE="|| ( FTL GPL-2+ )" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz + infinality png static-libs utils" +RESTRICT="!bindist? ( bindist )" # bug 541408 + +CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) + utils? ( + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] + ) + )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" + +src_prepare() { + enable_option() { + sed -i -e "/#define $1/a #define $1" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + # This is the same as the 01 patch from infinality + epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + + if use infinality; then + epatch "${WORKDIR}/${INFINALITY_PATCH}" + + # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11 + enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING + fi + + if ! use bindist; then + # See http://freetype.org/patents.html + # ClearType is covered by several Microsoft patents in the US + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + fi + + if ! use adobe-cff; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 + + if use utils; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + cd "${S}" || die + fi + + # we need non-/bin/sh to run configure + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ + "${S}"/builds/unix/configure || die + fi + + autotools-utils_src_prepare +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --enable-biarch-config + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + autotools-utils_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils; then + einfo "Building utils" + # fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils; then + einfo "Installing utils" + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die + local ft2demo + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ + "${ED}"/usr/bin || die + done + fi +} + +multilib_src_install_all() { + if use fontforge; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/internal -name '*.h' | \ + while read header; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + use doc && dohtml -r docs/* + + prune_libtool_files --all +} diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml index ed6ed0892a..d93cdef5cb 100644 --- a/media-libs/freetype/metadata.xml +++ b/media-libs/freetype/metadata.xml @@ -20,6 +20,7 @@ <flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag> <flag name="auto-hinter">Use the unpatented auto-hinter instead of the (recommended) TrueType bytecode interpreter</flag> + <flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag> <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag> <flag name="fontforge">Install internal headers required for TrueType debugger in <pkg>media-gfx/fontforge</pkg> (built with diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff new file mode 100644 index 0000000000..4b510a5506 --- /dev/null +++ b/media-libs/gavl/files/1.4.0-x32.diff @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines + +* Compilation fix + + +Index: gavl/cputest.c +=================================================================== +--- gavl/cputest.c (revision 4208) ++++ gavl/cputest.c (revision 4209) +@@ -69,6 +69,8 @@ + int rval = 0; + int eax, ebx, ecx, edx; + int max_std_level, max_ext_level, std_caps=0, ext_caps=0; ++ ++#ifndef ARCH_X86_64 + long a, c; + + __asm__ __volatile__ ( +@@ -94,6 +96,7 @@ + + if (a == c) + return 0; /* CPUID not supported */ ++#endif // !ARCH_X86_64 + + cpuid(0, max_std_level, ebx, ecx, edx); + + +------------------------------------------------------------------------ diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild index a6674fa770..ba89158721 100644 --- a/media-libs/gavl/gavl-1.4.0-r1.ebuild +++ b/media-libs/gavl/gavl-1.4.0-r1.ebuild @@ -23,6 +23,8 @@ DEPEND="doc? ( app-doc/doxygen ) DOCS=( AUTHORS README TODO ) src_prepare() { + epatch "${FILESDIR}/${PV}-x32.diff" + # AC_CONFIG_HEADERS, bug #467736 sed -i \ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild index e1cc44b845..c063f7dcdf 100644 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild @@ -40,6 +40,7 @@ RDEPEND=" orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) !<media-libs/gst-plugins-good-1.1:${SLOT} + x11-libs/libSM[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.12 diff --git a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild index da4da7c595..0c98c00511 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild +++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz" LICENSE="Old-MIT ISC icu" SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 [[ ${PV} == 9999 ]] || \ -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype" REQUIRED_USE="introspection? ( glib )" diff --git a/media-libs/jasper/jasper-1.900.1-r9.ebuild b/media-libs/jasper/jasper-1.900.1-r9.ebuild index f7a4d56504..8e9129e1f0 100644 --- a/media-libs/jasper/jasper-1.900.1-r9.ebuild +++ b/media-libs/jasper/jasper-1.900.1-r9.ebuild @@ -45,6 +45,11 @@ PATCHES=( DOCS=( NEWS README doc/. ) +src_prepare() { + chmod -R o-w "${S}" || die + autotools-multilib_src_prepare +} + src_configure() { local myeconfargs=( $(use_enable jpeg libjpeg) diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest index 3f59e6db76..1642a54228 100644 --- a/media-libs/libass/Manifest +++ b/media-libs/libass/Manifest @@ -1,9 +1,3 @@ -DIST libass-0.10.1.tar.xz 257792 SHA256 fbf287ac6d0dbdf015783b7354280ad8371c106326ad3f77a99471bc5aa18210 SHA512 3990886b9e708bf29f48921f65f99cee85031e299065860bce4f3e626970f82e60130b7525c1aaaf40e02c7b49d7003378724dbcf72db5894ab79768776694cf WHIRLPOOL 7278b893a047f8d0709e0b644495e2f42e4a10aea3174a91eea055501d66ad70f3bc7e924c49aaa9f8de3ddadc564aefbb6f35a0158ed714bf1486e275e1706b -DIST libass-0.10.2.tar.xz 278244 SHA256 f02afcc6410b800f0007dc7c282e897dab64f817c23b37d171fd6ff7fc4ca1d8 SHA512 50e77a488bc47d03a8cfca49cd7d26b702f88f649640cc63b40eb288c0f2771a6db5656e77fb8ab072a2a0b10dadf4a21e375ed831605c6de37466003f36bfd7 WHIRLPOOL d0884a663a86c33696f0909b1be09fad213ed972ec908d5dfc25fa13ed85fa48a6d4fabfe99efbf03939d5af7d0323969e06ee185c762914594e3b4ee78f0b03 -DIST libass-0.11.1.tar.xz 297016 SHA256 9d773a2880114ae4edc4b7686ed67219348d932c24e322ffd7d4c1d97e8813ac SHA512 16b047f688c9d9804d402e7a30377bc98ddadb5d464d621e6e035521532b9ff1e86d0e144e7c5089782afc6ac42ab934b03d75c1c4972fbaea7d8949f732ff62 WHIRLPOOL d89e1eea227cccf09f5267dcd853d07c5981359d8714aa541c3bd03a4e1b438fec4162c0a5fd0fe14cde9d8774f12a0473e24f62e3100fd880259c9248b04055 DIST libass-0.11.2.tar.xz 297172 SHA256 499dbaf14d7743e5899c9ca918988e81a9894f674b22d4682922f2e5d095ff9e SHA512 93e7b9ce328fc8ac7555c49015baf89c2f07957e501e3ea9ee5a2a7750c1454891a202a92f1348aef27c877bf01674bb7958b7e500c59538b67fe68a89315540 WHIRLPOOL 9c0e0b869efc815e9ecd0e0dfa0488b9643404bd8fc33fe4be2cbf7c026989b27ee7eeb6d8f11218d903881629d864b52bdb0f3a7433325f03b0a6c5a21d1d23 -DIST libass-0.12.0.tar.xz 310412 SHA256 0f34e9b4d1badbe85f2865e308d191b311f12266f9612a0fbf995ea8436bae29 SHA512 329727064ac1c90f1bfe449548a2b4d9e5b02346eb43c69b4e9623227efc19e91690950540fac7465aa44bd351103f17fa075f71836a1aa3400ee0647995a197 WHIRLPOOL 51aa187e10916c9d21902dbc1cd3418209f3df181b99392a2cd5271cc3d1eead09321240b3edd2e1a45c5658b6333afca2a8b9dba97c8bb32ea62d903920e764 -DIST libass-0.12.1.tar.xz 312020 SHA256 87864517e482e94130864ad9e4217c3925119e8cc0c1509133989997a61592d7 SHA512 ace022b214cdbd0f043037a6be25c2b58e12630717fe839f3a896462e3c7b0ccbb1e33c0128a09bbd416ec6e1e30230d514341a5c5c9190058fdedcf95082c91 WHIRLPOOL b351344437c1d3c780b84dd98c02c786216226019879186c3da659e690e27e23a49be38fb8e302551978fa5e02dcfed13c3ff057ce778757ee04af5433f06f4e -DIST libass-0.12.2.tar.xz 313208 SHA256 673c1b15bde182168b17e17ee1c8d9e01173f20af352134216135b5bf15bf1e3 SHA512 7cdbb6514c17eafebcc5e558d96ac06f301fa2d7658275379b8598b71b1e10c5dee4d91ebce5181ee3f16f4fe4e1afa9bb9942fa81c38babdcad7de05b59d35f WHIRLPOOL 7990731baa4ee55060dc86fd8fb240ae5fe4a7305aebdab3d434846fda7ed616b7247283b3f65de6db56e102965eb7cd21c9cee59c94f6b5b6a53068d01e11f3 DIST libass-0.12.3.tar.xz 313852 SHA256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2 WHIRLPOOL 7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719 -DIST libass-0.9.13.tar.xz 250536 SHA256 eef55595355cd4dd14b88b61d4e34c7bcfb6060a6b28f5a9ebc7dd5a72b69cc8 SHA512 82c1a280b5cff9dd09f015562db420295a465ce7e80ad51b2f879e347c3a675ea05ac2beaa106c178aa57a390a19eb1ffb90771689e76e2b0619e75673631e0d WHIRLPOOL b1769d3a5b9a14d43447ddaa8c459b5fda4c857abdee270d022cced3d5db93a25059ef4291c0fe27cf235c20507f6c77fdc9c3037d032bad57e1971eaa8436c9 +DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28 diff --git a/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch new file mode 100644 index 0000000000..3688aad4a4 --- /dev/null +++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch @@ -0,0 +1,26 @@ +From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001 +From: Luke Dashjr <luke-jr+git@utopios.org> +Date: Sat, 10 Oct 2015 08:11:38 +0000 +Subject: [PATCH] configure: Set the correct x32 machine option for yasm + +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 117b23b..d6fbe34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [ + X86=true + BITS=32 + ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ], ++ [x86_64-*-gnux32|amd64-*-gnux32], [ ++ AS=yasm ++ INTEL=true ++ X64=true ++ BITS=64 ++ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ], + [x86_64-*|amd64-*], [ + AS=yasm + INTEL=true diff --git a/media-libs/libass/libass-0.10.1.ebuild b/media-libs/libass/libass-0.10.1.ebuild deleted file mode 100644 index e6036f24ea..0000000000 --- a/media-libs/libass/libass-0.10.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://code.google.com/p/libass/" -SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 ) - >=media-libs/freetype-2.4:2 - virtual/libiconv - >=dev-libs/fribidi-0.19.0 - harfbuzz? ( >=media-libs/harfbuzz-0.9.11 ) - enca? ( app-i18n/enca )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="Changelog" - -src_configure() { - econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable harfbuzz) \ - $(use_enable static-libs static) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/libass/libass-0.10.2.ebuild b/media-libs/libass/libass-0.10.2.ebuild deleted file mode 100644 index 834b664542..0000000000 --- a/media-libs/libass/libass-0.10.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://code.google.com/p/libass/" -SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/5" # subslot = libass soname version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 ) - >=media-libs/freetype-2.4:2 - virtual/libiconv - >=dev-libs/fribidi-0.19.0 - harfbuzz? ( >=media-libs/harfbuzz-0.9.11[truetype] ) - enca? ( app-i18n/enca )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="Changelog" - -src_configure() { - econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable harfbuzz) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/media-libs/libass/libass-0.11.1.ebuild b/media-libs/libass/libass-0.11.1.ebuild deleted file mode 100644 index db78473d3f..0000000000 --- a/media-libs/libass/libass-0.11.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib-minimal - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://github.com/libass/libass" -SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/5" # subslot = libass soname version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] - harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] ) - enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -X86_CPU_OPTS="abi_x86_32 abi_x86_64" -for i in ${X86_CPU_OPTS} ; do - DEPEND="${DEPEND} - ${i}? ( dev-lang/yasm )" -done - -DOCS="Changelog" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable harfbuzz) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libass/libass-0.12.0.ebuild b/media-libs/libass/libass-0.12.0.ebuild deleted file mode 100644 index db78473d3f..0000000000 --- a/media-libs/libass/libass-0.12.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib-minimal - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://github.com/libass/libass" -SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/5" # subslot = libass soname version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] - harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] ) - enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -X86_CPU_OPTS="abi_x86_32 abi_x86_64" -for i in ${X86_CPU_OPTS} ; do - DEPEND="${DEPEND} - ${i}? ( dev-lang/yasm )" -done - -DOCS="Changelog" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable harfbuzz) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libass/libass-0.12.2.ebuild b/media-libs/libass/libass-0.12.2.ebuild deleted file mode 100644 index de9132e95c..0000000000 --- a/media-libs/libass/libass-0.12.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib-minimal - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://github.com/libass/libass" -SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0/5" # subslot = libass soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] - harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] ) - enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -X86_CPU_OPTS="abi_x86_32 abi_x86_64" -for i in ${X86_CPU_OPTS} ; do - DEPEND="${DEPEND} - ${i}? ( dev-lang/yasm )" -done - -DOCS="Changelog" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable harfbuzz) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libass/libass-0.12.1.ebuild b/media-libs/libass/libass-0.13.0.ebuild index de9132e95c..3646359d0d 100644 --- a/media-libs/libass/libass-0.12.1.ebuild +++ b/media-libs/libass/libass-0.13.0.ebuild @@ -12,14 +12,13 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" LICENSE="ISC" SLOT="0/5" # subslot = libass soname version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig +harfbuzz static-libs" +IUSE="+fontconfig +harfbuzz static-libs" RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}] - harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] ) - enca? ( >=app-i18n/enca-1.14-r1[${MULTILIB_USEDEP}] )" + harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -32,12 +31,17 @@ done DOCS="Changelog" +src_prepare() { + # bug #509460 + epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch" +} + multilib_src_configure() { ECONF_SOURCE="${S}" econf \ - $(use_enable enca) \ $(use_enable fontconfig) \ $(use_enable harfbuzz) \ - $(use_enable static-libs static) + $(use_enable static-libs static) \ + --disable-require-system-font-provider } multilib_src_install_all() { diff --git a/media-libs/libass/libass-0.9.13.ebuild b/media-libs/libass/libass-0.9.13.ebuild deleted file mode 100644 index 01c4f968a9..0000000000 --- a/media-libs/libass/libass-0.9.13.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -DESCRIPTION="Library for SSA/ASS subtitles rendering" -HOMEPAGE="https://code.google.com/p/libass/" -SRC_URI="https://libass.googlecode.com/files/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="+enca +fontconfig static-libs" - -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 ) - >=media-libs/freetype-2.2.1:2 - virtual/libiconv - enca? ( app-i18n/enca )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="Changelog" - -src_configure() { - econf \ - $(use_enable enca) \ - $(use_enable fontconfig) \ - $(use_enable static-libs static) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest index b9ab7eedaa..5fad57fc6f 100644 --- a/media-libs/libbluray/Manifest +++ b/media-libs/libbluray/Manifest @@ -1,6 +1,3 @@ -DIST libbluray-0.5.0.tar.bz2 559639 SHA256 19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216 SHA512 bd709a01689bbb03ac291a2544eee93b47d72e065c8ccf825f9fb568ddb339a75a18c721b3c59fd4a8214a0f9b652cbd845bccd9de08248dd4cf61616a77e1dd WHIRLPOOL ab6b422889e6469053f567a489afe6c4cbf79cc1e56461ccad3eec948be819748da7760377686430db212a249b450da8fe5a9c914828f13354135dcf2e314add -DIST libbluray-0.6.1.tar.bz2 586646 SHA256 bf51c4fb65f4d8b02e9b2708017ecd829c8d0dfa9239bca011e67a2a6e368b3f SHA512 f32f5ce238955efd8d9f34d488d89ca1f52b4dd1f63334ade92dc8e053b15e180549fc5f83f4b7d532c145acb1b8ddfca2230df65451bfb0f77bf6aa2c3806ec WHIRLPOOL bed882bef96effc81241eab736b6be4caa098fdb1e9e2c50bdb70ebfdf0ee53490aed6697bc298c5a8271547113e9c0de151b95198ca2db90733ea70adc4ad44 DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a WHIRLPOOL 5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec814444b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506 -DIST libbluray-0.7.0.tar.bz2 597266 SHA256 f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d SHA512 2bf73398003e5a6b12ffdf44ec5716c18da4a176328b4eac52adb3337d09fcb4e5b553362cb67d70506fb0b2cd60e2e59ccc398104630554f41f0b095fc4703f WHIRLPOOL 28f9422704230cfe2fea3c84d0c7c3ae06495b07fdc22c33937d2cb4a0087be4af4364d219ab38e0ee94cf5c14826f7f2a1750da6d5c8f7e71178dbdfb1fc1e5 -DIST libbluray-0.8.0.tar.bz2 621606 SHA256 7b80208b2af54313fedbb49f54b7e13ff7f86f1843a81dddd5e17aa9575bfd08 SHA512 1928ed86a39f3846014f3c5083e78aaf87366fb4589a48a1a87ad053fc32edafe6e89d382c44cffc5f27610d4d3ccf17bf2ef79982e3e39a0ada6895defe5bfe WHIRLPOOL d72b50920e8f0b994cc543d3efbc6b7e4849a1dcda1774e1eda85e527a36a8382c3e273fb45309776c696bb7b215271cfb822f04c02a4133c5ee5687ea8805f5 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801 +DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc diff --git a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild b/media-libs/libbluray/libbluray-0.5.0-r1.ebuild deleted file mode 100644 index 357e82fc70..0000000000 --- a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal - -DESCRIPTION="Blu-ray playback libraries" -HOMEPAGE="http://www.videolan.org/developers/libbluray.html" -SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="aacs java static-libs +truetype utils +xml" - -COMMON_DEPEND=" - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${COMMON_DEPEND} - aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.6 ) -" -DEPEND=" - ${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.6 - dev-java/ant-core - ) - virtual/pkgconfig -" - -DOCS=( ChangeLog README.txt ) - -src_prepare() { - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' src/Makefile.am || die - - eautoreconf - - java-pkg-opt-2_src_prepare - fi -} - -multilib_src_configure() { - local myconf - if multilib_is_native_abi && use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="--enable-bdjava" - else - myconf="--disable-bdjava" - fi - - ECONF_SOURCE="${S}" econf \ - --disable-optimizations \ - $(multilib_native_use_enable utils examples) \ - $(use_with truetype freetype) \ - $(use_enable static-libs static) \ - $(use_with xml libxml2) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use utils; then - cd src - dobin index_dump mobj_dump mpls_dump - cd .libs/ - dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump - if use java; then - dobin bdj_test - fi - fi - - if multilib_is_native_abi && use java; then - java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}.jar - doenvd "${FILESDIR}"/90${PN} - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libbluray/libbluray-0.5.0.ebuild b/media-libs/libbluray/libbluray-0.5.0.ebuild deleted file mode 100644 index 5527be37b5..0000000000 --- a/media-libs/libbluray/libbluray-0.5.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools java-pkg-opt-2 flag-o-matic eutils - -DESCRIPTION="Blu-ray playback libraries" -HOMEPAGE="http://www.videolan.org/developers/libbluray.html" -SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="aacs java static-libs +truetype utils +xml" - -COMMON_DEPEND=" - xml? ( dev-libs/libxml2 ) -" -RDEPEND=" - ${COMMON_DEPEND} - aacs? ( media-libs/libaacs ) - java? ( - truetype? ( media-libs/freetype:2 ) - >=virtual/jre-1.6 - ) -" -DEPEND=" - ${COMMON_DEPEND} - java? ( - truetype? ( media-libs/freetype:2 ) - >=virtual/jdk-1.6 - dev-java/ant-core - ) - virtual/pkgconfig -" - -DOCS=( ChangeLog README.txt ) - -src_prepare() { - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' src/Makefile.am || die - - eautoreconf - - java-pkg-opt-2_src_prepare - fi -} - -src_configure() { - local myconf - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="$(use_with truetype freetype)" - fi - - econf \ - --disable-optimizations \ - $(use_enable utils examples) \ - $(use_enable java bdjava) \ - $(use_enable static-libs static) \ - $(use_with xml libxml2) \ - ${myconf} -} - -src_install() { - default - - if use utils; then - cd src - dobin index_dump mobj_dump mpls_dump - cd .libs/ - dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump - if use java; then - dobin bdj_test - fi - fi - - if use java; then - java-pkg_dojar "${S}"/src/.libs/${PN}.jar - doenvd "${FILESDIR}"/90${PN} - fi - - prune_libtool_files -} diff --git a/media-libs/libbluray/libbluray-0.6.1.ebuild b/media-libs/libbluray/libbluray-0.6.1.ebuild deleted file mode 100644 index 54985a27b5..0000000000 --- a/media-libs/libbluray/libbluray-0.6.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal - -DESCRIPTION="Blu-ray playback libraries" -HOMEPAGE="http://www.videolan.org/developers/libbluray.html" -SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="aacs java static-libs +truetype utils +xml" - -COMMON_DEPEND=" - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${COMMON_DEPEND} - aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.6 ) -" -DEPEND=" - ${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.6 - dev-java/ant-core - ) - virtual/pkgconfig -" - -DOCS=( ChangeLog README.txt ) - -src_prepare() { - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' src/Makefile.am || die - - java-pkg-opt-2_src_prepare - fi - - eautoreconf -} - -multilib_src_configure() { - local myconf - if multilib_is_native_abi && use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="--enable-bdjava" - else - myconf="--disable-bdjava" - fi - - ECONF_SOURCE="${S}" econf \ - --disable-optimizations \ - $(multilib_native_use_enable utils examples) \ - $(use_with truetype freetype) \ - $(use_enable static-libs static) \ - $(use_with xml libxml2) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use utils; then - cd src - dobin index_dump mobj_dump mpls_dump - cd .libs/ - dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump - if use java; then - dobin bdj_test - fi - fi - - if multilib_is_native_abi && use java; then - java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar - doenvd "${FILESDIR}"/90${PN} - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libbluray/libbluray-0.7.0.ebuild b/media-libs/libbluray/libbluray-0.7.0.ebuild deleted file mode 100644 index 0d583a8452..0000000000 --- a/media-libs/libbluray/libbluray-0.7.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal - -DESCRIPTION="Blu-ray playback libraries" -HOMEPAGE="http://www.videolan.org/developers/libbluray.html" -SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" - -COMMON_DEPEND=" - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${COMMON_DEPEND} - aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] ) - bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.6 ) -" -DEPEND=" - ${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.6 - dev-java/ant-core - ) - virtual/pkgconfig -" - -DOCS=( ChangeLog README.txt ) - -src_prepare() { - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' src/Makefile.am || die - - java-pkg-opt-2_src_prepare - fi - - eautoreconf -} - -multilib_src_configure() { - local myconf - if multilib_is_native_abi && use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="--enable-bdjava" - else - myconf="--disable-bdjava" - fi - - ECONF_SOURCE="${S}" econf \ - --disable-optimizations \ - $(multilib_native_use_enable utils examples) \ - $(use_with fontconfig) \ - $(use_with truetype freetype) \ - $(use_enable static-libs static) \ - $(use_with xml libxml2) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use utils; then - cd src - dobin index_dump mobj_dump mpls_dump - cd .libs/ - dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump - if use java; then - dobin bdj_test - fi - fi - - if multilib_is_native_abi && use java; then - java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar - doenvd "${FILESDIR}"/90${PN} - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/media-libs/libbluray/libbluray-0.8.0.ebuild b/media-libs/libbluray/libbluray-0.9.0.ebuild index 805d248c84..805d248c84 100644 --- a/media-libs/libbluray/libbluray-0.8.0.ebuild +++ b/media-libs/libbluray/libbluray-0.9.0.ebuild diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild index a462ec95d1..066cbb9a3d 100644 --- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild +++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild @@ -12,10 +12,10 @@ HOMEPAGE="http://dvdnav.mplayerhq.hu/" if [[ ${PV} = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="git://git.videolan.org/libdvdnav.git" - KEYWORDS="alpha hppa ia64 ppc ppc64 sparc" + KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc" else SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2" - KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index dd91fe8dd6..bd41654200 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,6 +1,6 @@ DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 SHA512 4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053 WHIRLPOOL 13c1366b9bef87cab42c88f75d1ff7eddb4ea745e0056154f1f3fb27deedee077d662395bada3bd5c18d6f8bf744d0b1f3d465967d33b453ea2acc327a6f166f DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081 WHIRLPOOL f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5 -DIST libjpeg-turbo-1.4.0.tar.gz 1524645 SHA256 d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee SHA512 60d038413acee43a23bb81d18309eed16e771d48b839b7aea52f582bbf9f99f04b3cc991e13cafc3d5df1441b726ea0792e7ad593ce4e52c96792c3b1df42c09 WHIRLPOOL 5f6c15bee87d9f9b82013801a8c6cd42c725ba4d65c0d60f990d4d0aec3c0b9334a5be832b34ae71d8606c801fc621de965c17b8b3067f7eef061f0155cbaa19 DIST libjpeg-turbo-1.4.1.tar.gz 1529614 SHA256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 SHA512 81197fdac40c55cb9820b832c55dab9dd5aa19427a22feb6027510a4dc9c45aeea6a37203447600481f5162a0a2ca972324997cc89fc7e51b51808260df0598d WHIRLPOOL b1c2a225720216b602dfda04a3ecf52d2251ea775c44d2cd872e9c33f43f4275ca2fbfaccba8d493c12ece4023f0c4e0c3c029837bdaff577bc401ee46a14433 +DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27 DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild index 537318b847..d473c175f8 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal +inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/" @@ -38,8 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) src_prepare() { epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 - # generate a new ./configure compatible with non-bash shells, #533902 - eautoreconf + elibtoolize java-pkg-opt-2_src_prepare } @@ -57,6 +56,8 @@ multilib_src_configure() { fi [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239 + # Force /bin/bash until upstream generates a new version. #533902 + CONFIG_SHELL=/bin/bash \ ECONF_SOURCE=${S} \ econf \ $(use_enable static-libs static) \ diff --git a/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild b/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild new file mode 100644 index 0000000000..1758259c33 --- /dev/null +++ b/media-libs/liblrdf/liblrdf-0.5.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools + +DESCRIPTION="A library for the manipulation of RDF file in LADSPA plugins" +HOMEPAGE="https://github.com/swh/LRDF" +SRC_URI="https://github.com/swh/LRDF/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="libressl static-libs" + +RDEPEND=" + !libressl? ( >=dev-libs/openssl-1:0 ) + libressl? ( dev-libs/libressl ) + media-libs/raptor:2 + >=media-libs/ladspa-sdk-1.12" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog README ) + +src_unpack() { + unpack ${A} + mv *-LRDF-* "${S}" +} + +src_prepare() { + sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c || die #392221 + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_test() { + has_version media-plugins/swh-plugins && default #392221 +} + +src_install() { + default + rm -f "${ED}"usr/lib*/liblrdf.la +} diff --git a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch index a6ccdb8784..b70ede8a81 100644 --- a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch +++ b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch @@ -5,7 +5,7 @@ Samuli Suominen (17 Nov 2012) * Refresh the patch against libmikmod 3.2.0 release since it didn't make it upstream $ wget http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz $ tar -vzxf SDL_mixer-1.2.12.tar.gz (or "tar xf" with GNU tar) - $Â unzip libmikmod-3.1.12.zip + $ unzip libmikmod-3.1.12.zip $ ls -l libmikmod-3.1.12-loopingvolume-fix.diff --- playercode/mplayer.c diff --git a/media-libs/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild index a51a0163ec..1b0c3cefe3 100644 --- a/media-libs/libpng/libpng-1.6.18.ebuild +++ b/media-libs/libpng/libpng-1.6.18.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz LICENSE="libpng" SLOT="0/16" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng neon static-libs" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] diff --git a/media-libs/libraw/libraw-0.16.2.ebuild b/media-libs/libraw/libraw-0.16.2.ebuild index b233eda35f..c5337c592e 100644 --- a/media-libs/libraw/libraw-0.16.2.ebuild +++ b/media-libs/libraw/libraw-0.16.2.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz # http://www.libraw.org/data/LICENSE.LibRaw.pdf LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3" SLOT="0/10" # subslot = libraw soname version -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="demosaic examples jpeg jpeg2k +lcms openmp" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest index a0b6df83d0..2b8ea8bdff 100644 --- a/media-libs/libsoundio/Manifest +++ b/media-libs/libsoundio/Manifest @@ -1 +1,2 @@ DIST libsoundio-1.0.0.tar.gz 112139 SHA256 f05d87916266b6b32020c3e13b78ce9f3a758c43c8f8c8bbaf37578d99e1d3e2 SHA512 d0a0eda701d99ef658ee2858dbf4be2ec872d74bc1c9d05ed5484adcc17e774530c150fcd86cd1213a8dceb6373dfd3319a2c97c506ada0cdfe0f02551c0ddd0 WHIRLPOOL 1720e8eb64dc407a17dfbc9ccc8406184e0fa8c5bcc799553e5af181c9faebc0d0ba75fab0c8d9f6332fec6db1711ae9d6afe4be0e970fd5e9b526511b0a8965 +DIST libsoundio-1.0.2.tar.gz 114311 SHA256 821fc5b94880f09f57178ea7b474216e7dd0d698c8cac98e366d28d3b4f3ac4d SHA512 9110c6dd2f2ee8ed9f4a454b92aea5292b1b222aebe6851d247e964a6aa80f1d95d490e2d3da5d06cbd6853407c4002f02d163fac5631f51e110d57a9b58faa3 WHIRLPOOL 1e82ddf04c42e64e1bc19519ab07265ebd0f56ac2f32bb83ab4710e61cdfaa392ee5103c2a9a23c3a8f71be93cb713b2a4356b07ba03e1e5957f0b7e3b517dff diff --git a/media-libs/libsoundio/libsoundio-1.0.2.ebuild b/media-libs/libsoundio/libsoundio-1.0.2.ebuild new file mode 100644 index 0000000000..87bbaafdcf --- /dev/null +++ b/media-libs/libsoundio/libsoundio-1.0.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-multilib + +DESCRIPTION="C99 library providing cross-platform audio input and output" +HOMEPAGE="http://libsound.io/" +SRC_URI="http://libsound.io/release/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/1" +KEYWORDS="~amd64" +IUSE="alsa coreaudio examples pulseaudio static-libs" + +DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" + +# ENABLE_JACK does not support the current version of jack1 +# See https://github.com/andrewrk/libsoundio/issues/11 +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_ALSA=$(usex alsa) + -DENABLE_COREAUDIO=$(usex coreaudio) + -DENABLE_JACK=no + -DENABLE_PULSEAUDIO=$(usex pulseaudio) + -DENABLE_WASAPI=no + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples) + -DBUILD_TESTS=no + ) + cmake-utils_src_configure +} diff --git a/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch new file mode 100644 index 0000000000..a0102e8edc --- /dev/null +++ b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch @@ -0,0 +1,22 @@ +From: David Tardon <dtardon@redhat.com> +Date: Sun, 30 Aug 2015 11:59:23 +0000 (+0200) +Subject: fix build with boost 1.59 +X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff_plain;h=2968c3dff8572b4734cb42c7bd5b00222f7fb288;hp=4b03893826bcc5f859b0ac3bea6a98269499d99f + +fix build with boost 1.59 + +Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916 +--- + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index dc0f8fd..6946b0a 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -22,6 +22,7 @@ generated_files = \ + $(top_builddir)/src/lib/tokens.h \ + $(top_builddir)/src/lib/tokenhash.h + ++libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED + libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@ + libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@ + libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch new file mode 100644 index 0000000000..19104a143c --- /dev/null +++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch @@ -0,0 +1,49 @@ +From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Sat, 25 Jul 2015 15:11:19 +0200 +Subject: [PATCH] fix test + +The previous version only worked with libxml2 < 2.9.2, because of a bug +in handling nested elements of the same name. + +Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f +--- + configure.ac | 4 ++++ + src/test/importtest.cpp | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1611dcb..a075e73 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,6 +128,10 @@ AS_IF([test "x$enable_tools" = "xyes"], [ + PKG_CHECK_MODULES([REVENGE_STREAM],[ + librevenge-stream-0.0 + ]) ++ PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2], ++ [], ++ [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])] ++ ) + ]) + AC_SUBST([REVENGE_GENERATORS_CFLAGS]) + AC_SUBST([REVENGE_GENERATORS_LIBS]) +diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp +index 8554309..0296380 100644 +--- a/src/test/importtest.cpp ++++ b/src/test/importtest.cpp +@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme() + void ImportTest::testVsdxCharBgColor() + { + m_doc = parse("bgcolor.vsdx", m_buffer); +- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color"); +- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); +- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); ++ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color"); ++ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); ++ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61"); + } + + CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); +-- +1.7.9.5 + diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild new file mode 100644 index 0000000000..0770f0fd1d --- /dev/null +++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/" +inherit base eutils +[[ ${PV} == 9999 ]] && inherit autotools git-r3 + +DESCRIPTION="Library parsing the visio documents" +HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" +[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" + +LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" +IUSE="doc static-libs test tools" + +RDEPEND=" + dev-libs/icu:= + dev-libs/librevenge + dev-libs/libxml2 + sys-libs/zlib +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.46 + dev-util/gperf + sys-devel/libtool + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( dev-util/cppunit ) +" + +src_prepare() { + epatch "${FILESDIR}/${P}-fix-tests.patch" \ + "${FILESDIR}/${P}-boost-1.59.patch" + [[ -d m4 ]] || mkdir "m4" + base_src_prepare + [[ ${PV} == 9999 ]] && eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable static-libs static) \ + --disable-werror \ + $(use_with doc docs) \ + $(use_enable test tests) \ + $(use_enable tools) +} + +src_install() { + default + prune_libtool_files --all +} diff --git a/media-libs/libwebp/libwebp-0.3.1.ebuild b/media-libs/libwebp/libwebp-0.3.1.ebuild index 9d5e95d9bd..360e507fec 100644 --- a/media-libs/libwebp/libwebp-0.3.1.ebuild +++ b/media-libs/libwebp/libwebp-0.3.1.ebuild @@ -30,7 +30,7 @@ ECONF_SOURCE=${S} src_prepare() { # This is conflicting with `usex` later on, upstream is using ac_cv_ wrong # If modifying configure.ac, eautoreconf is required because of "Maintainer mode" - sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure ||Â die + sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die } multilib_src_configure() { diff --git a/media-libs/libwebp/libwebp-0.4.0.ebuild b/media-libs/libwebp/libwebp-0.4.0.ebuild index 10039152cb..48c4994f7d 100644 --- a/media-libs/libwebp/libwebp-0.4.0.ebuild +++ b/media-libs/libwebp/libwebp-0.4.0.ebuild @@ -30,7 +30,7 @@ ECONF_SOURCE=${S} src_prepare() { # This is conflicting with `usex` later on, upstream is using ac_cv_ wrong # If modifying configure.ac, eautoreconf is required because of "Maintainer mode" - sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure ||Â die + sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die # Fix libtool relinking, bug 499270. elibtoolize diff --git a/media-libs/libwebp/libwebp-0.4.2.ebuild b/media-libs/libwebp/libwebp-0.4.2.ebuild index 6c9ebc2904..6740c477a6 100644 --- a/media-libs/libwebp/libwebp-0.4.2.ebuild +++ b/media-libs/libwebp/libwebp-0.4.2.ebuild @@ -30,7 +30,7 @@ ECONF_SOURCE=${S} src_prepare() { # This is conflicting with `usex` later on, upstream is using ac_cv_ wrong # If modifying configure.ac, eautoreconf is required because of "Maintainer mode" - sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure ||Â die + sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die # Fix libtool relinking, bug 499270. elibtoolize diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 1d16822b02..0bc5c956f4 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -3,8 +3,6 @@ DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 SHA512 1a379de8471f9154aa1348c15d24a56788e42b666094d63aa5dc8bffd1ed87c1ab50fb95adac010a92d832be4ec1be60b712179ad1ec99869ee653ccb576f50e WHIRLPOOL 45ff4f46a9c165c2cd3f49696f9d972216fdbc27051287d4eea4210f25631fb1faca517a714cc50229c463be1628dfbf71ba689d02ed3b3d52bfc71683fe667e DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390 -DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6 -DIST mesa-10.6.8.tar.xz 7042260 SHA256 e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd SHA512 ebb2daff1afcc5f6808c5c9948814014c0570b18fb91481c9d09b2c28776ce6e4fd8bba650e559ac5d87d30fe06b38032c78828c13b95d5f9a0338d44b75f61e WHIRLPOOL e94395c0954875c9b1eaa6692385593a24242c3915012dcf8fcfa7b0d16cff33fc80421234dccdfafa4ecb9b82a176f177cf7ec622f6b80eac6de4cfcb5c7552 -DIST mesa-11.0.0.tar.xz 7257112 SHA256 e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 SHA512 9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f WHIRLPOOL 454466396fac029450b619c842fa1e34906e5c529a67a575e9096f9e9b1584ad5b00f9ada2656e0469d5cf6d94e966709d4e0253484eb03d32f93e3e7d521f78 -DIST mesa-11.0.2.tar.xz 7263112 SHA256 fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4 SHA512 5b388c7464a97259b43f0c95114ddb6ea8d748a53a495202a01aa757baf5784c66c57e1f462a909bb9b3bf1239aa4fcbefbfc9fad2376a8288493304a2988ec4 WHIRLPOOL b4dd696c6135dd5f9711727ab57d042941a8b949010192544138f184086d90f1e9da1408ea937c95e831788c0797317d938e40948ae25226928ea14f77503859 +DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b +DIST mesa-11.0.3.tar.xz 7264824 SHA256 ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6 SHA512 7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15 WHIRLPOOL edcef9df038384cace1b650efbd0245dc6b7ecdd6e22d35a57590d919b1bceb73ff5b531b441b06da806ff1efe357872d1f16d3d0364fbd85000a2d7b406391f DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97 diff --git a/media-libs/mesa/mesa-10.6.8.ebuild b/media-libs/mesa/mesa-10.6.8.ebuild deleted file mode 100644 index 4386f87e25..0000000000 --- a/media-libs/mesa/mesa-10.6.8.ebuild +++ /dev/null @@ -1,463 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" -FOLDER="${PV/_rc*/}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -if [[ $PV == 9999* ]]; then - SRC_URI="" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz" -fi - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -RESTRICT="!bindist? ( bindist )" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm - +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau - wayland xvmc xa kernel_FreeBSD" - -REQUIRED_USE=" - d3d9? ( dri3 gallium ) - llvm? ( gallium ) - opencl? ( gallium llvm ) - openmax? ( gallium ) - gles1? ( egl ) - gles2? ( egl ) - vaapi? ( gallium ) - vdpau? ( gallium ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_radeon? ( || ( classic gallium ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium llvm ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vmware? ( gallium ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) - >=app-eselect/eselect-opengl-1.3.0 - udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) ) - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) - dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) ) - !video_cards_r600? ( - video_cards_radeon? ( || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) ) - ) - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - ) - opencl? ( - app-eselect/eselect-opencl - dev-libs/libclc - || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) - ) - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -for card in ${INTEL_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - " -done - -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done - -DEPEND="${RDEPEND} - llvm? ( - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/gettext - virtual/pkgconfig - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] -" -[[ ${PV} == "9999" ]] && DEPEND+=" - sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - # fix for hardened pax_kernel, bug 240956 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch - - eautoreconf -} - -multilib_src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - driver_enable video_cards_nouveau nouveau - - # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 - fi - fi - - if use egl; then - myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") " - fi - - if use gallium; then - myconf+=" - $(use_enable d3d9 nine) - $(use_enable llvm gallium-llvm) - $(use_enable openmax omx) - $(use_enable vaapi va) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers" - - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - myconf+=" --disable-asm" - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - ECONF_SOURCE="${S}" \ - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable d3d9 nine) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(use_enable egl) \ - $(use_enable gbm) \ - $(use_enable gles1) \ - $(use_enable gles2) \ - $(use_enable nptl glx-tls) \ - $(use_enable osmesa) \ - $(use_enable !udev sysfs) \ - --enable-llvm-shared-libs \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi - - if use openmax; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" - doenvd "${T}"/99mesaxdgomx - keepdir /usr/share/mesa/xdg - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - if use llvm; then - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' - pushd src/gallium/drivers/llvmpipe >/dev/null || die - emake ${llvm_tests} - pax-mark m ${llvm_tests} - popd >/dev/null || die - fi - emake check -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi - - # run omxregister-bellagio to make the OpenMAX drivers known system-wide - if use openmax; then - ebegin "Registering OpenMAX drivers" - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ - omxregister-bellagio - eend $? - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled. Please see patents.txt for an explanation." - fi - - if ! has_version media-libs/libtxc_dxtn; then - elog "Note that in order to have full S3TC support, it is necessary to install" - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" - elog "textures in some apps, and some others even require this to run." - fi -} - -pkg_prerm() { - if use openmax; then - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/mesa-10.6.6.ebuild b/media-libs/mesa/mesa-10.6.9.ebuild index 4386f87e25..0baae142ad 100644 --- a/media-libs/mesa/mesa-10.6.6.ebuild +++ b/media-libs/mesa/mesa-10.6.9.ebuild @@ -187,10 +187,7 @@ pkg_setup() { } src_prepare() { - # fix for hardened pax_kernel, bug 240956 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch - - eautoreconf + [[ ${PV} == 9999 ]] && eautoreconf } multilib_src_configure() { @@ -264,11 +261,9 @@ multilib_src_configure() { fi fi - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " + # x86 hardened pax_kernel needs glx-read-only-text, bug 240956 + if [[ ${ABI} == x86 ]]; then + myconf+="$(use_enable pax_kernel glx-read-only-text)" fi # on abi_x86_32 hardened we need to have asm disable diff --git a/media-libs/mesa/mesa-11.0.0.ebuild b/media-libs/mesa/mesa-11.0.0.ebuild deleted file mode 100644 index 309e8824f2..0000000000 --- a/media-libs/mesa/mesa-11.0.0.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" -FOLDER="${PV/_rc*/}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -if [[ $PV == 9999* ]]; then - SRC_URI="" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz" -fi - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -RESTRICT="!bindist? ( bindist )" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm - +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau - wayland xvmc xa kernel_FreeBSD" - -REQUIRED_USE=" - d3d9? ( dri3 gallium ) - llvm? ( gallium ) - opencl? ( gallium llvm ) - openmax? ( gallium ) - gles1? ( egl ) - gles2? ( egl ) - vaapi? ( gallium ) - vdpau? ( gallium ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_radeon? ( || ( classic gallium ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium llvm ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vmware? ( gallium ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) - >=app-eselect/eselect-opengl-1.3.0 - udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) ) - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) - dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) ) - !video_cards_r600? ( - video_cards_radeon? ( || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) ) - ) - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - ) - opencl? ( - app-eselect/eselect-opencl - dev-libs/libclc - || ( - >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}] - ) - ) - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -for card in ${INTEL_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - " -done - -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -DEPEND="${RDEPEND} - llvm? ( - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/gettext - virtual/pkgconfig - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] -" -[[ ${PV} == "9999" ]] && DEPEND+=" - sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - # fix for hardened pax_kernel, bug 240956 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch - - eautoreconf -} - -multilib_src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - driver_enable video_cards_nouveau nouveau - - # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 - fi - fi - - if use egl; then - myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") " - fi - - if use gallium; then - myconf+=" - $(use_enable d3d9 nine) - $(use_enable llvm gallium-llvm) - $(use_enable openmax omx) - $(use_enable vaapi va) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers" - - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - myconf+=" --disable-asm" - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - ECONF_SOURCE="${S}" \ - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable d3d9 nine) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(use_enable egl) \ - $(use_enable gbm) \ - $(use_enable gles1) \ - $(use_enable gles2) \ - $(use_enable nptl glx-tls) \ - $(use_enable osmesa) \ - $(use_enable !udev sysfs) \ - --enable-llvm-shared-libs \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi - - if use openmax; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" - doenvd "${T}"/99mesaxdgomx - keepdir /usr/share/mesa/xdg - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - if use llvm; then - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' - pushd src/gallium/drivers/llvmpipe >/dev/null || die - emake ${llvm_tests} - pax-mark m ${llvm_tests} - popd >/dev/null || die - fi - emake check -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi - - # run omxregister-bellagio to make the OpenMAX drivers known system-wide - if use openmax; then - ebegin "Registering OpenMAX drivers" - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ - omxregister-bellagio - eend $? - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled. Please see patents.txt for an explanation." - fi - - if ! has_version media-libs/libtxc_dxtn; then - elog "Note that in order to have full S3TC support, it is necessary to install" - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" - elog "textures in some apps, and some others even require this to run." - fi -} - -pkg_prerm() { - if use openmax; then - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/mesa-11.0.2.ebuild b/media-libs/mesa/mesa-11.0.3.ebuild index 38d52d0732..38d52d0732 100644 --- a/media-libs/mesa/mesa-11.0.2.ebuild +++ b/media-libs/mesa/mesa-11.0.3.ebuild diff --git a/media-libs/mlt/mlt-0.9.8.ebuild b/media-libs/mlt/mlt-0.9.8.ebuild index a65afee871..021bf918e7 100644 --- a/media-libs/mlt/mlt-0.9.8.ebuild +++ b/media-libs/mlt/mlt-0.9.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/mlt/archive/v0.9.8.tar.gz -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="compressed-lumas debug ffmpeg fftw frei0r gtk jack kde kdenlive libav libsamplerate melt opengl cpu_flags_x86_mmx qt4 rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 xine xml lua python ruby vdpau" # java perl php tcl IUSE="${IUSE} kernel_linux" diff --git a/media-libs/opusfile/opusfile-0.6-r1.ebuild b/media-libs/opusfile/opusfile-0.6-r1.ebuild new file mode 100644 index 0000000000..719011df8f --- /dev/null +++ b/media-libs/opusfile/opusfile-0.6-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A high-level decoding and seeking API for .opus files" +HOMEPAGE="http://www.opus-codec.org/" +SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc fixed-point +float +http libressl static-libs" + +RDEPEND="media-libs/libogg + media-libs/opus + http? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +REQUIRED_USE="^^ ( fixed-point float )" + +src_configure() { + econf \ + --docdir=/usr/share/doc/${PF} \ + $(use_enable doc) \ + $(use_enable fixed-point)\ + $(use_enable float) \ + $(use_enable http) \ + $(use_enable static-libs static) +} diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index 0dc2a5a2c5..c8c49eb368 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,8 +1,3 @@ -DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a SHA512 d6801f326f9848672f889cb9fe43da865b2351143b8f31f17341c62b89ac01f430cdc56c12d8bf9cf9f041e8381494915a84508eaf41898ef87631385ee6f3c2 WHIRLPOOL 6aed824854947435819d157c2c371ca358ce05d518adcfea9ec6c47a74bdd97d9c527e989b9eb0a6d2f00060c45186d3a3ade22af21d450c9e2c25be9aa46b34 -DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe SHA512 915e2933596f4809a7cba25a6eb7f8a555daaeeb3a5a95a314cb947940d562e12d164f52ab6b94d7abd52e66ee986d3414c54685390a619357eef22ba0cd6a6a WHIRLPOOL e61b779d9eba7cad48899bc7eb88e9b5e140013d016792ddd4d2c149f7447d8bbf528615b751c095813519218bc7e3072ded407c386043dff8270d2c43a7ecb9 -DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b -DIST x264-snapshot-20130506-2245.tar.bz2 608013 SHA256 da7055a457d19b97ff35a2830e7caae665ea06d22ddc28393168983d1cd21f61 SHA512 6ba35f6b39fefbda6990dc0fd674efbe403b0616f2f02d71ae3e7bbc6ce2bab8878a963dd5f306f8a2b3b9a74c5c0b4dbf9dfb9dc0e602b807f726cf072905b5 WHIRLPOOL bfb4b7dd0e865cd9305ac177f5c544555004039209dda695fcc932aab647b87c96f0bae4fa040276bd3dbee64dcf982f3c2447efdbc01c1d42f040c9d5d0af85 -DIST x264-snapshot-20130731-2245.tar.bz2 625052 SHA256 caa39660f2ddc9dc53033af709452a21479c7b7c715c5f9d744d0d452c2d9e67 SHA512 2abcab4013dee9ac58779afd89fc558a8286cf33affda037e95a7e10cf00387cee1ad461ac59c5020fd9b72d303170f16d4e4b5593ec21528a33b0f530878d9d WHIRLPOOL 6f7fcc1c05c47a0d31578fbd0268b84ba458a968b087fb7d1050f67739bec140a1c3ded288cd0000180b5be921b469357ec9cdc363fc1eec82d82bd795557b56 -DIST x264-snapshot-20130912-2245.tar.bz2 628862 SHA256 87142cf15b7d7052f2e046a4b80adc3176fd6421889ab3bae83afc10d57ec648 SHA512 3e2223ca465b1ac214a421c512477524309694f321baabcd62b84bc341de34ecf196c8c91a931bbda0d7538dc138b924dc22ed7f242e135e4b53b387638b40c0 WHIRLPOOL b795a91511994761e9cf6e3a279708e4536ebc281b9ca1d18f0bceb93c89c062608d2e5c779a0f924d2dc005f90921223b42b22e409eaaca8a0041aae354213f DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024 +DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3 diff --git a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch b/media-libs/x264/files/x264-0.0.20120707-gcc48.patch deleted file mode 100644 index 16cb4bff00..0000000000 --- a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 6129dbe86484393a2ea520be94ef9b550b0bd113 Mon Sep 17 00:00:00 2001 -From: Jason Garrett-Glaser <jason@x264.com> -Date: Wed, 27 Feb 2013 13:30:22 -0800 -Subject: [PATCH] Fix array overreads that caused miscompilation in gcc 4.8 - ---- - common/common.h | 1 + - common/set.c | 78 +++++++++++++++++++++++++++++++------------------------- - tools/checkasm.c | 2 +- - 3 files changed, 45 insertions(+), 36 deletions(-) - -diff --git a/common/common.h b/common/common.h -index 39ad5cb..0da1d43 100644 ---- a/common/common.h -+++ b/common/common.h -@@ -40,6 +40,7 @@ - #define IS_DISPOSABLE(type) ( type == X264_TYPE_B ) - #define FIX8(f) ((int)(f*(1<<8)+.5)) - #define ALIGN(x,a) (((x)+((a)-1))&~((a)-1)) -+#define ARRAY_ELEMS(a) ((sizeof(a))/(sizeof(a[0]))) - - #define CHECKED_MALLOC( var, size )\ - do {\ -diff --git a/common/set.c b/common/set.c -index 4c72125..fa8b158 100644 ---- a/common/set.c -+++ b/common/set.c -@@ -85,44 +85,49 @@ int x264_cqm_init( x264_t *h ) - int max_qp_err = -1; - int max_chroma_qp_err = -1; - int min_qp_err = QP_MAX+1; -- int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4 : 2; /* Checkasm may segfault if optimized out by --chroma-format */ -+ int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4 -+ : h->param.analyse.b_transform_8x8 ? 2 : 0; /* Checkasm may segfault if optimized out by --chroma-format */ - -- for( int i = 0; i < 4 + num_8x8_lists; i++ ) -- { -- int size = i<4 ? 16 : 64; -- int j; -- for( j = (i<4 ? 0 : 4); j < i; j++ ) -- if( !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) ) -- break; -- if( j < i ) -- { -- h-> quant4_mf[i] = h-> quant4_mf[j]; -- h->dequant4_mf[i] = h->dequant4_mf[j]; -- h->unquant4_mf[i] = h->unquant4_mf[j]; -- } -- else -- { -- CHECKED_MALLOC( h-> quant4_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) ); -- CHECKED_MALLOC( h->dequant4_mf[i], 6*size*sizeof(int) ); -- CHECKED_MALLOC( h->unquant4_mf[i], (QP_MAX+1)*size*sizeof(int) ); -- } -- -- for( j = (i<4 ? 0 : 4); j < i; j++ ) -- if( deadzone[j&3] == deadzone[i&3] && -- !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) ) -- break; -- if( j < i ) -- { -- h->quant4_bias[i] = h->quant4_bias[j]; -- h->quant4_bias0[i] = h->quant4_bias0[j]; -- } -- else -- { -- CHECKED_MALLOC( h->quant4_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) ); -- CHECKED_MALLOC( h->quant4_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) ); -- } -+#define CQM_ALLOC( w, count )\ -+ for( int i = 0; i < count; i++ )\ -+ {\ -+ int size = w*w;\ -+ int start = w == 8 ? 4 : 0;\ -+ int j;\ -+ for( j = 0; j < i; j++ )\ -+ if( !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\ -+ break;\ -+ if( j < i )\ -+ {\ -+ h-> quant##w##_mf[i] = h-> quant##w##_mf[j];\ -+ h->dequant##w##_mf[i] = h->dequant##w##_mf[j];\ -+ h->unquant##w##_mf[i] = h->unquant##w##_mf[j];\ -+ }\ -+ else\ -+ {\ -+ CHECKED_MALLOC( h-> quant##w##_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) );\ -+ CHECKED_MALLOC( h->dequant##w##_mf[i], 6*size*sizeof(int) );\ -+ CHECKED_MALLOC( h->unquant##w##_mf[i], (QP_MAX+1)*size*sizeof(int) );\ -+ }\ -+ for( j = 0; j < i; j++ )\ -+ if( deadzone[j] == deadzone[i] &&\ -+ !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\ -+ break;\ -+ if( j < i )\ -+ {\ -+ h->quant##w##_bias[i] = h->quant##w##_bias[j];\ -+ h->quant##w##_bias0[i] = h->quant##w##_bias0[j];\ -+ }\ -+ else\ -+ {\ -+ CHECKED_MALLOC( h->quant##w##_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) );\ -+ CHECKED_MALLOC( h->quant##w##_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) );\ -+ }\ - } - -+ CQM_ALLOC( 4, 4 ) -+ CQM_ALLOC( 8, num_8x8_lists ) -+ - for( int q = 0; q < 6; q++ ) - { - for( int i = 0; i < 16; i++ ) -@@ -204,6 +209,9 @@ int x264_cqm_init( x264_t *h ) - for( int cat = 0; cat < 3 + CHROMA444; cat++ ) - { - int dct8x8 = cat&1; -+ if( !h->param.analyse.b_transform_8x8 && dct8x8 ) -+ continue; -+ - int size = dct8x8 ? 64 : 16; - udctcoef *nr_offset = h->nr_offset_emergency[q][cat]; - /* Denoise chroma first (due to h264's chroma QP offset), then luma, then DC. */ -diff --git a/tools/checkasm.c b/tools/checkasm.c -index 9135b70..441687b 100644 ---- a/tools/checkasm.c -+++ b/tools/checkasm.c -@@ -309,7 +309,7 @@ static int check_pixel( int cpu_ref, int cpu_new ) - - #define TEST_PIXEL( name, align ) \ - ok = 1, used_asm = 0; \ -- for( int i = 0; i < 8; i++ ) \ -+ for( int i = 0; i < ARRAY_ELEMS(pixel_c.name); i++ ) \ - { \ - int res_c, res_asm; \ - if( pixel_asm.name[i] != pixel_ref.name[i] ) \ --- -1.8.1.5 - diff --git a/media-libs/x264/files/x264-0.0.20130731-cflags.patch b/media-libs/x264/files/x264-0.0.20130731-cflags.patch deleted file mode 100644 index 3014b47eca..0000000000 --- a/media-libs/x264/files/x264-0.0.20130731-cflags.patch +++ /dev/null @@ -1,62 +0,0 @@ -https://bugs.gentoo.org/420241 for x32 stuff -initial x32 support -- no asm code, just pure C - -avoid messing too much with CFLAGS. -https://bugs.gentoo.org/show_bug.cgi?id=351219 -https://bugs.gentoo.org/show_bug.cgi?id=413661 - - -Index: x264-9999/configure -=================================================================== ---- x264-9999.orig/configure -+++ x264-9999/configure -@@ -553,11 +553,6 @@ case $host_cpu in - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then - CFLAGS="$CFLAGS -march=i686" - fi -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then -- CFLAGS="$CFLAGS -mfpmath=sse -msse" -- fi -- CFLAGS="-m32 $CFLAGS" -- LDFLAGS="-m32 $LDFLAGS" - else - # icc on linux has various degrees of mod16 stack support - if [ $SYS = LINUX ]; then -@@ -588,13 +583,8 @@ case $host_cpu in - x86_64) - ARCH="X86_64" - AS="yasm" -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" - if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" -- if cc_check '' "-arch x86_64"; then -- CFLAGS="$CFLAGS -arch x86_64" -- LDFLAGS="$LDFLAGS -arch x86_64" -- fi - elif [ "$SYS" = WINDOWS ]; then - ASFLAGS="$ASFLAGS -f win32 -m amd64" - # only the GNU toolchain is inconsistent in prefixing function names with _ -@@ -602,7 +592,11 @@ case $host_cpu in - [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase" - [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" - else -- ASFLAGS="$ASFLAGS -f elf -m amd64" -+ if cpp_check "" "" "__ILP32__" ; then -+ ASFLAGS="$ASFLAGS -f elf -m x32" -+ else -+ ASFLAGS="$ASFLAGS -f elf -m amd64" -+ fi - fi - ;; - powerpc|powerpc64) -@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then - [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" - fi - --if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then -- CFLAGS="$CFLAGS -fomit-frame-pointer" --fi -- - if [ "$strip" = "yes" ]; then - CFLAGS="$CFLAGS -s" - LDFLAGS="$LDFLAGS -s" diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch b/media-libs/x264/files/x264-0.0.20151011-cflags.patch new file mode 100644 index 0000000000..851e3f0457 --- /dev/null +++ b/media-libs/x264/files/x264-0.0.20151011-cflags.patch @@ -0,0 +1,51 @@ +Index: x264-snapshot-20151011-2245/configure +=================================================================== +--- x264-snapshot-20151011-2245.orig/configure ++++ x264-snapshot-20151011-2245/configure +@@ -672,11 +672,6 @@ case $host_cpu in + if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then + CFLAGS="$CFLAGS -march=i686" + fi +- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then +- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" +- fi +- CFLAGS="-m32 $CFLAGS" +- LDFLAGS="-m32 $LDFLAGS" + fi + if [ "$SYS" = MACOSX ]; then + ASFLAGS="$ASFLAGS -f macho32 -DPREFIX" +@@ -695,13 +690,8 @@ case $host_cpu in + AS_EXT=".asm" + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" + stack_alignment=16 +- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" + if [ "$SYS" = MACOSX ]; then + ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" +- if cc_check '' "-arch x86_64"; then +- CFLAGS="$CFLAGS -arch x86_64" +- LDFLAGS="$LDFLAGS -arch x86_64" +- fi + elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then + ASFLAGS="$ASFLAGS -f win64" + # only the GNU toolchain is inconsistent in prefixing function names with _ +@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then + [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" + fi + +-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then +- CFLAGS="$CFLAGS -fomit-frame-pointer" +-fi +- + if [ "$strip" = "yes" ]; then + LDFLAGS="$LDFLAGS -s" + fi + +-if [ "$debug" = "yes" ]; then +- CFLAGS="-O1 -g $CFLAGS" +-else +- CFLAGS="-O3 -ffast-math $CFLAGS" +-fi +- + if cc_check '' -fno-tree-vectorize ; then + CFLAGS="$CFLAGS -fno-tree-vectorize" + fi diff --git a/media-libs/x264/files/x264-nostrip.patch b/media-libs/x264/files/x264-nostrip.patch deleted file mode 100644 index b4e2689a18..0000000000 --- a/media-libs/x264/files/x264-nostrip.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: x264-svn/configure -=================================================================== ---- x264-svn.orig/configure -+++ x264-svn/configure -@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then - ASFLAGS="$ASFLAGS -D__PIC__" - fi - --if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then -- CFLAGS="$CFLAGS -s -fomit-frame-pointer" -- LDFLAGS="$LDFLAGS -s" --fi -- - if [ "$debug" = "yes" ]; then - CFLAGS="-O1 -g $CFLAGS" - else diff --git a/media-libs/x264/files/x264-onlylib-20110425.patch b/media-libs/x264/files/x264-onlylib-20110425.patch deleted file mode 100644 index 6f216b92fa..0000000000 --- a/media-libs/x264/files/x264-onlylib-20110425.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: x264-snapshot-20110425-2245/Makefile -=================================================================== ---- x264-snapshot-20110425-2245.orig/Makefile -+++ x264-snapshot-20110425-2245/Makefile -@@ -137,7 +137,7 @@ DEP = depend - - .PHONY: all default fprofiled clean distclean install uninstall dox test testclean - --default: $(DEP) x264$(EXE) -+default: $(DEP) - - $(LIBX264): .depend $(OBJS) $(OBJASM) - $(AR)$@ $(OBJS) $(OBJASM) -@@ -207,7 +207,7 @@ distclean: clean - rm -f config.mak x264_config.h config.h config.log x264.pc x264.def - rm -rf test/ - --install: x264$(EXE) $(SONAME) -+install: $(LIBX264) $(SONAME) - install -d $(DESTDIR)$(bindir) - install -d $(DESTDIR)$(includedir) - install -d $(DESTDIR)$(libdir) -@@ -216,7 +216,6 @@ install: x264$(EXE) $(SONAME) - install -m 644 x264_config.h $(DESTDIR)$(includedir) - install -m 644 $(LIBX264) $(DESTDIR)$(libdir) - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig -- install x264$(EXE) $(DESTDIR)$(bindir) - $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264)) - ifeq ($(SYS),WINDOWS) - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) diff --git a/media-libs/x264/files/x264-x32.patch b/media-libs/x264/files/x264-x32.patch deleted file mode 100644 index 7af4405a84..0000000000 --- a/media-libs/x264/files/x264-x32.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/420241 - -initial x32 support -- no asm code, just pure C - ---- a/configure -+++ b/configure -@@ -567,7 +567,13 @@ case $host_cpu in - x86_64) - ARCH="X86_64" - AS="yasm" -- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" -+ if [ $compiler = GNU ]; then -+ if cpp_check "" "" "__ILP32__" ; then -+ CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS" -+ else -+ CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" -+ fi -+ fi - if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX" - if cc_check '' "-arch x86_64"; then -@@ -580,7 +586,11 @@ case $host_cpu in - [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX" - [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS" - else -- ASFLAGS="$ASFLAGS -f elf -m amd64" -+ if cpp_check "" "" "__ILP32__" ; then -+ AS="${cross_prefix}as" -+ else -+ ASFLAGS="$ASFLAGS -f elf -m amd64" -+ fi - fi - ;; - powerpc|powerpc64) diff --git a/media-libs/x264/x264-0.0.20111220.ebuild b/media-libs/x264/x264-0.0.20111220.ebuild deleted file mode 100644 index a54e600713..0000000000 --- a/media-libs/x264/x264-0.0.20111220.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -if [ "${PV#9999}" != "${PV}" ] ; then - V_ECLASS="git-2" -else - V_ECLASS="versionator" -fi - -inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS} - -if [ "${PV#9999}" = "${PV}" ]; then - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" -fi -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [ "${PV#9999}" != "${PV}" ] ; then - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -if [ "${PV#9999}" != "${PV}" ]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -fi -IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" - -RDEPEND="" -DEPEND="amd64? ( >=dev-lang/yasm-1 ) - x86? ( >=dev-lang/yasm-1 ) - x86-fbsd? ( >=dev-lang/yasm-1 )" - -if [ "${PV#9999}" = "${PV}" ]; then - S="${WORKDIR}/${MY_P}" -fi - -DOCS="AUTHORS doc/*.txt" - -src_configure() { - tc-export CC - - local myconf="" - use 10bit && myconf+=" --bit-depth=10" - use debug && myconf+=" --enable-debug" - use interlaced || myconf+=" --disable-interlaced" - use static-libs && myconf+=" --enable-static" - use threads || myconf+=" --disable-thread" - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - if use x86 && use pic; then - myconf+=" --disable-asm" - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-cli \ - --disable-avs \ - --disable-lavf \ - --disable-swscale \ - --disable-ffms \ - --disable-gpac \ - --enable-pic \ - --enable-shared \ - --host="${CHOST}" \ - ${myconf} || die - - # this is a nasty workaround for bug #376925 as upstream doesn't like us - # fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild deleted file mode 100644 index 4c099cedd6..0000000000 --- a/media-libs/x264/x264-0.0.20120327.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -if [ "${PV#9999}" != "${PV}" ] ; then - V_ECLASS="git-2" -else - V_ECLASS="versionator" -fi - -inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS} - -if [ "${PV#9999}" = "${PV}" ]; then - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" -fi -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [ "${PV#9999}" != "${PV}" ] ; then - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -if [ "${PV#9999}" != "${PV}" ]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -fi -IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" - -RDEPEND="" -DEPEND="amd64? ( >=dev-lang/yasm-1 ) - x86? ( >=dev-lang/yasm-1 ) - x86-fbsd? ( >=dev-lang/yasm-1 )" - -if [ "${PV#9999}" = "${PV}" ]; then - S="${WORKDIR}/${MY_P}" -fi - -DOCS="AUTHORS doc/*.txt" - -src_configure() { - tc-export CC - - local myconf="" - use 10bit && myconf+=" --bit-depth=10" - use debug && myconf+=" --enable-debug" - use interlaced || myconf+=" --disable-interlaced" - use static-libs && myconf+=" --enable-static" - use threads || myconf+=" --disable-thread" - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - if use x86 && use pic; then - myconf+=" --disable-asm" - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-cli \ - --disable-avs \ - --disable-lavf \ - --disable-swscale \ - --disable-ffms \ - --disable-gpac \ - --enable-pic \ - --enable-shared \ - --host="${CHOST}" \ - ${myconf} || die - - # this is a nasty workaround for bug #376925 as upstream doesn't like us - # fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild deleted file mode 100644 index 49c91fb338..0000000000 --- a/media-libs/x264/x264-0.0.20120707.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -if [ "${PV#9999}" != "${PV}" ] ; then - V_ECLASS="git-2" -else - V_ECLASS="versionator" -fi - -inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS} - -if [ "${PV#9999}" = "${PV}" ]; then - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" -fi -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [ "${PV#9999}" != "${PV}" ] ; then - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SRC_URI="" -else - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -if [ "${PV#9999}" != "${PV}" ]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -fi -IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" - -RDEPEND="" -DEPEND="amd64? ( >=dev-lang/yasm-1 ) - amd64-fbsd? ( >=dev-lang/yasm-1 ) - x86? ( >=dev-lang/yasm-1 ) - x86-fbsd? ( >=dev-lang/yasm-1 )" - -if [ "${PV#9999}" = "${PV}" ]; then - S="${WORKDIR}/${MY_P}" -fi - -DOCS="AUTHORS doc/*.txt" - -src_prepare() { - # Solaris' /bin/sh doesn't grok the syntax in these files - sed -i -e '1c\#!/usr/bin/env sh' configure version.sh || die - # for sparc-solaris - if [[ ${CHOST} == sparc*-solaris* ]] ; then - sed -i -e 's:-DPIC::g' configure || die - fi - # for OSX - sed -i -e "s|-arch x86_64||g" configure || die - epatch "${FILESDIR}"/x264-x32.patch #420241 - - # fix crashes when compiled with gcc 4.8 - epatch "${FILESDIR}"/${P}-gcc48.patch -} - -src_configure() { - tc-export CC - - local myconf="" - use 10bit && myconf+=" --bit-depth=10" - use debug && myconf+=" --enable-debug" - use interlaced || myconf+=" --disable-interlaced" - use static-libs && myconf+=" --enable-static" - use threads || myconf+=" --disable-thread" - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - if use x86 && use pic || [[ ${ABI} == "x32" ]] ; then - myconf+=" --disable-asm" - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-cli \ - --disable-avs \ - --disable-lavf \ - --disable-swscale \ - --disable-ffms \ - --disable-gpac \ - --enable-pic \ - --enable-shared \ - --host="${CHOST}" \ - ${myconf} || die - - # this is a nasty workaround for bug #376925 as upstream doesn't like us - # fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-libs/x264/x264-0.0.20130506.ebuild b/media-libs/x264/x264-0.0.20130506.ebuild deleted file mode 100644 index 11e10b0d33..0000000000 --- a/media-libs/x264/x264-0.0.20130506.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [[ ${PV} == 9999 ]]; then - inherit git-2 - EGIT_REPO_URI="git://git.videolan.org/x264.git" - SLOT="0" -else - inherit versionator - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - - SONAME="132" - SLOT="0/${SONAME}" - - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -IUSE="10bit custom-cflags +interlaced pic static-libs +threads" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="amd64? ( ${ASM_DEP} ) - amd64-fbsd? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} )" - -DOCS="AUTHORS doc/*.txt" - -src_prepare() { - # Initial support for x32 ABI, bug #420241 - epatch "${FILESDIR}"/x264-x32.patch -} - -src_configure() { - tc-export CC - local asm_conf="" - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - if use x86 && use pic || [[ ${ABI} == "x32" ]]; then - asm_conf=" --disable-asm" - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-cli \ - --disable-avs \ - --disable-lavf \ - --disable-swscale \ - --disable-ffms \ - --disable-gpac \ - --enable-pic \ - --enable-shared \ - --host="${CHOST}" \ - $(usex 10bit "--bit-depth=10" "") \ - $(usex interlaced "" "--disable-interlaced") \ - $(usex static-libs "" "--enable-static") \ - $(usex threads "" "--disable-thread") \ - ${asm_conf} || die - - # this is a nasty workaround for bug #376925 as upstream doesn't like us - # fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-libs/x264/x264-0.0.20130912.ebuild b/media-libs/x264/x264-0.0.20130912.ebuild deleted file mode 100644 index c561342597..0000000000 --- a/media-libs/x264/x264-0.0.20130912.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal - -DESCRIPTION="A free library for encoding X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -if [[ ${PV} == 9999 ]]; then - inherit git-2 - EGIT_REPO_URI="git://git.videolan.org/x264.git" -else - inherit versionator - MY_P="x264-snapshot-$(get_version_component_range 3)-2245" - SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - S="${WORKDIR}/${MY_P}" -fi - -SONAME="138" -SLOT="0/${SONAME}" - -LICENSE="GPL-2" -IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} )" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" - -DOCS="AUTHORS doc/*.txt" - -src_prepare() { - # Initial support for x32 ABI, bug #420241 - # Avoid messing too much with CFLAGS. - epatch "${FILESDIR}"/${P}-cflags.patch -} - -multilib_src_configure() { - tc-export CC - local asm_conf="" - - if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then - asm_conf=" --disable-asm" - fi - - # Upstream uses this, see the cflags patch - use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" - - "${S}/configure" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-cli \ - --disable-avs \ - --disable-lavf \ - --disable-swscale \ - --disable-ffms \ - --disable-gpac \ - --enable-pic \ - --enable-shared \ - --host="${CHOST}" \ - $(usex 10bit "--bit-depth=10" "") \ - $(usex interlaced "" "--disable-interlaced") \ - --disable-opencl \ - $(usex static-libs "--enable-static" "") \ - $(usex threads "" "--disable-thread") \ - ${asm_conf} || die -} diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20151011.ebuild index 0f1ce85f71..f097db63ae 100644 --- a/media-libs/x264/x264-0.0.20130731.ebuild +++ b/media-libs/x264/x264-0.0.20151011.ebuild @@ -19,16 +19,18 @@ else S="${WORKDIR}/${MY_P}" fi -SONAME="135" +SONAME="148" SLOT="0/${SONAME}" LICENSE="GPL-2" -IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads" +IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" ASM_DEP=">=dev-lang/yasm-1.2.0" DEPEND="abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} )" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 + abi_x86_64? ( ${ASM_DEP} ) + opencl? ( dev-lang/perl )" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DOCS="AUTHORS doc/*.txt" @@ -36,7 +38,7 @@ DOCS="AUTHORS doc/*.txt" src_prepare() { # Initial support for x32 ABI, bug #420241 # Avoid messing too much with CFLAGS. - epatch "${FILESDIR}"/${P}-cflags.patch + epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch } multilib_src_configure() { @@ -49,6 +51,7 @@ multilib_src_configure() { # Upstream uses this, see the cflags patch use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse" + append-flags "-ffast-math" "${S}/configure" \ --prefix="${EPREFIX}"/usr \ @@ -64,7 +67,7 @@ multilib_src_configure() { --host="${CHOST}" \ $(usex 10bit "--bit-depth=10" "") \ $(usex interlaced "" "--disable-interlaced") \ - --disable-opencl \ + $(usex opencl "" "--disable-opencl") \ $(usex static-libs "--enable-static" "") \ $(usex threads "" "--disable-thread") \ ${asm_conf} || die diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 4dc50414bc..f097db63ae 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt" src_prepare() { # Initial support for x32 ABI, bug #420241 # Avoid messing too much with CFLAGS. - epatch "${FILESDIR}"/x264-cflags.patch + epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch } multilib_src_configure() { diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index ff456413d5..154e98a00b 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -1,2 +1,3 @@ DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744 +DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild new file mode 100644 index 0000000000..ee4a32fe9f --- /dev/null +++ b/media-libs/x265/x265-1.8.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-multilib multilib flag-o-matic + +if [[ ${PV} = 9999* ]]; then + inherit mercurial + EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" +else + SRC_URI=" + https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz + http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" +HOMEPAGE="http://x265.org/" + +LICENSE="GPL-2" +# subslot = libx265 soname +SLOT="0/68" +IUSE="+10bit test" + +ASM_DEPEND=">=dev-lang/yasm-1.2.0" +RDEPEND="" +DEPEND="${RDEPEND} + abi_x86_32? ( ${ASM_DEPEND} ) + abi_x86_64? ( ${ASM_DEPEND} )" + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + mercurial_src_unpack + # Can't set it at global scope due to mercurial.eclass limitations... + export S=${WORKDIR}/${P}/source + else + unpack ${A} + export S="$(echo "${WORKDIR}/${PN}_"*"/source")" + fi +} + +multilib_src_configure() { + append-cflags -fPIC + append-cxxflags -fPIC + local mycmakeargs=( + $(cmake-utils_use_enable test TESTS) + $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF") + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + + if [ "${ABI}" = x86 ] ; then + use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" + mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) + fi + + cmake-utils_src_configure +} + +src_configure() { + multilib_parallel_foreach_abi multilib_src_configure +} + +multilib_src_test() { + if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then + cd "${BUILD_DIR}/test" || die + for i in TestBench ; do + ./${i} || die + done + fi +} + +src_test() { + multilib_foreach_abi multilib_src_test +} + +src_install() { + cmake-multilib_src_install + dodoc -r "${S}/../doc/"* +} diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index 008e9cb26a..8a3e36f86b 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/59" +SLOT="0/75" IUSE="+10bit test" ASM_DEPEND=">=dev-lang/yasm-1.2.0" @@ -37,7 +37,7 @@ src_unpack() { export S=${WORKDIR}/${P}/source else unpack ${A} - export S="${WORKDIR}/${PN}_${PV}/source" + export S="$(echo "${WORKDIR}/${PN}_"*"/source")" fi } |