From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- media-libs/xine-lib/Manifest | 5 +- .../files/xine-lib-1.2.6-imagemagick7.patch | 13 -- media-libs/xine-lib/xine-lib-1.2.10.ebuild | 2 +- media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 222 --------------------- 4 files changed, 2 insertions(+), 240 deletions(-) delete mode 100644 media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch delete mode 100644 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild (limited to 'media-libs/xine-lib') diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index e32b3e6f0ea4..439148d9a97b 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,9 +1,6 @@ -AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf -DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c -EBUILD xine-lib-1.2.10.ebuild 5030 BLAKE2B 8a04851fb7e758e5f1e912548a46b15a667304df2818a77ce710972e1f4afea01b3c3bb141ec3a66236cb76847049693b043f2a8669efb1481cad703fd251f51 SHA512 46ac0af7e5b51f33e661c7a6ed3fc9982e0e2c840db68b6e3081f84d4125eaaa238d0c235bbd3c883f86b37de3d08989c13ee4acc2d8ade61732e9fea975c341 +EBUILD xine-lib-1.2.10.ebuild 5029 BLAKE2B afe0f697c63d796399b38efa40c8a9ad3a6122f35481a3d2afd69cdbe2705e7157cba5929f70cf74726028b819f287ac402e791266342453a7989081c14f625e SHA512 94118d72ecdd8bd3ac0287f0da165d6c4a5f6923c8be63840edccfeb9e2c239595dd2e4d27e0721b92de4b88193781f5a83fb68049faed6dd97acd695591ffe8 EBUILD xine-lib-1.2.11.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c -EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7 EBUILD xine-lib-1.2.9999.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c MISC metadata.xml 2498 BLAKE2B 949a34fcf5204424c2a565ce2329b3f878e4ef817882839bbec09a6d721a8756be6dc37eff2a0bb7e007d333e2bc4896ac6c853f7fe5b1f9c8f4ed3a66ada640 SHA512 f975a8763a3f31a27a769e4649cd7c6ecd113cb4fcd36556f5f7830b9de989be219a0c9f90db4a4df87e9ffd584d4c2e86346da084c95d32dc17adcc30f98c28 diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch deleted file mode 100644 index 34062222e32c..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD - ---- xine-lib-1.2.6/src/video_dec/image.c -+++ xine-lib-1.2.6/src/video_dec/image.c -@@ -39,7 +39,7 @@ - #define LOG - */ - --#include -+#include - #ifdef PACKAGE_NAME - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild index a8fa37374f1f..49cb170173da 100644 --- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then NLS_DEPEND="sys-devel/gettext" NLS_RDEPEND="virtual/libintl" else - KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~x86" + KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86" SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" NLS_IUSE="nls" NLS_DEPEND="nls? ( sys-devel/gettext )" diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild deleted file mode 100644 index f1ccbed79848..000000000000 --- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic libtool - -if [[ ${PV} == *9999* ]]; then - EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2" - inherit autotools mercurial - unset NLS_IUSE - NLS_DEPEND="sys-devel/gettext" - NLS_RDEPEND="virtual/libintl" -else - KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86" - SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" - NLS_IUSE="nls" - NLS_DEPEND="nls? ( sys-devel/gettext )" - NLS_RDEPEND="nls? ( virtual/libintl )" -fi - -DESCRIPTION="Core libraries for Xine movie player" -HOMEPAGE="http://xine.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="1" -IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}" - -RDEPEND="${NLS_RDEPEND} - dev-libs/libxdg-basedir - media-libs/libdvdnav - media-video/ffmpeg:0= - sys-libs/zlib:= - virtual/libiconv - a52? ( media-libs/a52dec ) - aac? ( media-libs/faad2 ) - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - bluray? ( >=media-libs/libbluray-0.2.1:= ) - css? ( >=media-libs/libdvdcss-1.2.10 ) - dts? ( media-libs/libdca ) - dxr3? ( media-libs/libfame ) - flac? ( media-libs/flac ) - gtk? ( x11-libs/gdk-pixbuf:2 ) - imagemagick? ( virtual/imagemagick-tools ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - libcaca? ( media-libs/libcaca ) - mad? ( media-libs/libmad ) - mng? ( media-libs/libmng:= ) - modplug? ( >=media-libs/libmodplug-0.8.8.1 ) - musepack? ( >=media-sound/musepack-tools-444 ) - opengl? ( - virtual/glu - virtual/opengl - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl ) - speex? ( - media-libs/libogg - media-libs/speex - ) - theora? ( - media-libs/libogg - media-libs/libtheora - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva:0=[X,opengl] ) - vcd? ( - >=media-video/vcdimager-0.7.23 - dev-libs/libcdio:0=[-minimal] - ) - vdpau? ( x11-libs/libvdpau ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - vpx? ( media-libs/libvpx:0= ) - wavpack? ( media-sound/wavpack ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libxcb - ) - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" -DEPEND="${RDEPEND} - ${NLS_DEPEND} - app-arch/xz-utils - >=sys-devel/libtool-2.2.6b - virtual/pkgconfig - oss? ( virtual/os-headers ) - v4l? ( virtual/os-headers ) - X? ( - x11-base/xorg-proto - x11-libs/libXt - ) - xv? ( x11-base/xorg-proto ) - xvmc? ( x11-base/xorg-proto ) - xinerama? ( x11-base/xorg-proto ) -" -REQUIRED_USE=" - vidix? ( || ( X fbcon ) ) - xv? ( X ) - xinerama? ( X ) -" - -src_prepare() { - default - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch" - fi - - sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - - if [[ "${PV}" = *9999* ]] ; then - eautoreconf - else - elibtoolize - fi - - local x - for x in 0 1 2 3; do - sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die - done -} - -src_configure() { - [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519 - - local win32dir #197236 - if has_multilib_profile; then - win32dir=/usr/$(ABI="x86" get_libdir)/win32 - else - win32dir=/usr/$(get_libdir)/win32 - fi - - local myconf=( - --disable-directfb - --disable-gnomevfs - --disable-optimizations - --disable-real-codecs - --disable-v4l - --disable-w32dll - --enable-avformat - --with-external-dvdnav - --with-real-codecs-path=/usr/$(get_libdir)/codecs - --with-w32-path=${win32dir} - --with-xv-path=/usr/$(get_libdir) - --without-esound - --without-fusionsound - $(use_enable a52 a52dec) - $(use_enable aac faad) - $(use_enable aalib) - $(use_enable altivec) - $(use_enable bluray) - $(use_enable dts) - $(use_enable dvb) - $(use_enable dxr3) - $(use_enable fbcon fb) - $(use_enable gtk gdkpixbuf) - $(use_enable ipv6) - $(use_enable jpeg libjpeg) - $(use_enable mad) - $(use_enable mmap) - $(use_enable mng) - $(use_enable modplug) - $(use_enable musepack) - $(use_enable opengl) - $(use_enable opengl glu) - $(use_enable oss) - $(use_enable samba) - $(use_enable v4l libv4l) - $(use_enable v4l v4l2) - $(use_enable vaapi) - $(use_enable vdpau) - $(use_enable vis) - $(use_enable vidix) - $(use_enable xinerama) - $(use_enable xvmc) - $(use_enable vcd) - $(use_enable vdr) - $(use_enable vpx) - $(use_with alsa) - $(use_with flac libflac) - $(use_with imagemagick) - $(use_with jack) - $(use_with libcaca caca) - $(use_with pulseaudio) - $(use_with sdl) - $(use_with speex) - $(use_with theora) - $(use_with truetype fontconfig) - $(use_with truetype freetype) - $(use_with vorbis) - $(use_with wavpack) - $(use_with X x) - $(use_with X xcb) - ) - [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) ) - - econf "${myconf[@]}" -} - -src_compile() { - # enable verbose building, bug #448140 - emake V=1 -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - rm -f "${ED}"usr/share/doc/${PF}/COPYING || die -} -- cgit v1.2.3