[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2023-06-10 Thread Andreas Sturmlechner
commit: c769755bd61678a0720b66e30c0169cdb0cc0e6d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 22:23:26 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 22:23:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c769755b

media-libs/xine-lib: drop 1.2.12-r4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/xine-lib/Manifest   |   1 -
 .../files/xine-lib-1.2.12-dav1d-1.0.0.patch|  22 --
 .../files/xine-lib-1.2.12-fix-mmap-crash.patch |  15 --
 media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild  | 234 -
 4 files changed, 272 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 8d57c36528f1..9cdc369cb760 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1 @@
-DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B 
e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8
 SHA512 
cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 
8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942
 SHA512 
269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
deleted file mode 100644
index cb3253cf99a5..
--- a/media-libs/xine-lib/files/xine-lib-1.2.12-dav1d-1.0.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/835791
-https://sourceforge.net/p/xine/tickets/11/
 a/src/video_dec/dav1d.c
-+++ b/src/video_dec/dav1d.c
-@@ -544,11 +544,17 @@
-
-   /* multithreading */
-   ncpu = xine_cpu_count();
-+#if DAV1D_API_VERSION_MAJOR > 5
-+  settings.n_threads = ncpu + 1;
-+  xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
-+"Using %d threads\n", settings.n_threads);
-+#else
-   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
-   settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
-   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
- "Using %d frame threads, %d tile threads\n",
- settings.n_frame_threads, settings.n_tile_threads);
-+#endif
-
-   /* dri frame allocator */
-   settings.allocator.cookie = this;

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch
deleted file mode 100644
index df5515f0495c..
--- a/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://sourceforge.net/p/xine/tickets/12/
-https://sourceforge.net/p/xine/xine-lib-1.2/ci/f56d70b45346ca9363a720724b0c2d00fc798988/tree/src/input/input_file.c?diff=d6e5d46a943257f0be171fb8ab16050810a21581
-https://bugs.gentoo.org/846398
-
 a/src/input/input_file.c
-+++ b/src/input/input_file.c
-@@ -449,7 +449,7 @@
- #ifdef HAVE_MMAP
-   this->mmap_base = NULL;
-   do {
--uint8_t mmap_base;
-+uint8_t *mmap_base;
- size_t tmp_size;
- /* may cause truncation - if it does, DON'T mmap! */
- tmp_size = (size_t)sbuf.st_size;

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
deleted file mode 100644
index 2f42d1c56c87..
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == ** ]]; 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 ~riscv 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 bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug 
musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l 
vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc 
${NLS_IUSE}"
-
-BDEPEND="
-   app-arch/xz-utils
-   >=sys-devel/libtool-2.2.6b
-   virtual/pkgconfig
-"
-RDEPEND="
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-06-01 Thread Jakov Smolić
commit: 2aff4506fe008dc8329016411bec7c71ba7d3758
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun  1 06:58:35 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun  1 06:58:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aff4506

media-libs/xine-lib: Stabilize 1.2.13-r2 ppc64, #907575

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index ecdae8484169..9639f9b46329 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
NLS_RDEPEND="virtual/libintl"
 else
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~x86"
S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
NLS_IUSE="nls"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-06-01 Thread Sam James
commit: 22be9e8def47e2d024ff5d2e2ca7c64758f1d939
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 06:45:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 06:45:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22be9e8d

media-libs/xine-lib: Stabilize 1.2.13-r2 ppc, #907575

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index 0f972a2a269f..ecdae8484169 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
NLS_RDEPEND="virtual/libintl"
 else
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
NLS_IUSE="nls"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-06-01 Thread Sam James
commit: 864edf13eb6048e72b57f468bbc0702465c8060a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 06:21:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 06:21:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864edf13

media-libs/xine-lib: Stabilize 1.2.13-r2 amd64, #907575

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index fb49dfdecd7e..0f972a2a269f 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
NLS_RDEPEND="virtual/libintl"
 else
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-   KEYWORDS="~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
NLS_IUSE="nls"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-05-31 Thread Sam James
commit: 73e3b7d7490db5a481a64d1ae2661b81b4e06907
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:21:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:21:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e3b7d7

media-libs/xine-lib: Stabilize 1.2.13-r2 arm64, #907575

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index 6ee408c8c782..fb49dfdecd7e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
NLS_RDEPEND="virtual/libintl"
 else
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
NLS_IUSE="nls"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-04-16 Thread Matt Turner
commit: 6cb5494e8a82af007cad9c240a795d0a47ad1de5
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Apr 17 01:01:53 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Apr 17 01:25:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb5494e

media-libs/xine-lib: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.13.ebuild | 233 -
 1 file changed, 233 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
deleted file mode 100644
index a7cce97ce1ac..
--- a/media-libs/xine-lib/xine-lib-1.2.13.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == ** ]]; 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
-   SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-   S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
-
-   NLS_IUSE="nls"
-   NLS_DEPEND="nls? ( sys-devel/gettext )"
-   NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="https://xine.sourceforge.net/;
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-REQUIRED_USE="
-   vidix? ( || ( X fbcon ) )
-   wayland? ( opengl )
-   xv? ( X )
-   xinerama? ( X )
-"
-
-RDEPEND="
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-   media-video/ffmpeg:=
-   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 )
-   dav1d? ( media-libs/dav1d:= )
-   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? ( media-libs/libjpeg-turbo:= )
-   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 )
-   nfs? ( net-fs/libnfs:= )
-   opengl? (
-   virtual/glu
-   virtual/opengl
-   )
-   pulseaudio? ( media-libs/libpulse )
-   samba? ( net-fs/samba )
-   sftp? ( net-libs/libssh2 )
-   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? ( media-libs/libva:=[opengl,X] )
-   vcd? (
-   >=media-video/vcdimager-0.7.23
-   dev-libs/libcdio:=[-minimal]
-   )
-   vdpau? ( x11-libs/libvdpau )
-   vorbis? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   vpx? ( media-libs/libvpx:= )
-   wavpack? ( media-sound/wavpack )
-   wayland? ( dev-libs/wayland )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libxcb:=
-   )
-   xinerama? ( x11-libs/libXinerama )
-   xv? ( x11-libs/libXv )
-   xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="
-   ${RDEPEND}
-   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 )
-"
-BDEPEND="
-   app-arch/xz-utils
-   >=sys-devel/libtool-2.2.6b
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   default
-
-   sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' 
src/vdr/input_vdr.c || die
-
-   if [[ "${PV}" = ** ]] ; 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} 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-04-16 Thread Matt Turner
commit: 6cf3788db1b20794f60869a6bbed5ba44cb526c0
Author: Sebastian Parborg  gmail  com>
AuthorDate: Tue Mar  7 16:57:05 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Apr 17 01:25:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf3788d

media-libs/xine-lib: Fix libva opengl useflag

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 .../xine-lib/{xine-lib-1.2.13-r1.ebuild => xine-lib-1.2.13-r2.ebuild}   | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
similarity index 99%
rename from media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild
rename to media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index ab82dbcb36f7..6ee408c8c782 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( media-libs/libva:=[opengl,X] )
+   vaapi? ( media-libs/libva:=[X] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:=[-minimal]

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index a7cce97ce1ac..1c9b1e49151b 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -81,7 +81,7 @@ RDEPEND="
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( media-libs/libva:=[opengl,X] )
+   vaapi? ( media-libs/libva:=[X] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:=[-minimal]



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/, media-libs/xine-lib/

2023-04-15 Thread Sam James
commit: 0889e8dd3f238c7b3e004160f9c8177add7e43cf
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 16 05:22:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 16 05:26:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0889e8dd

media-libs/xine-lib: fix configure w/ clang 16

Signed-off-by: Sam James  gentoo.org>

 .../files/xine-lib-1.2.13-configure-clang16.patch  | 115 ++
 media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild  | 237 +
 2 files changed, 352 insertions(+)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.13-configure-clang16.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.13-configure-clang16.patch
new file mode 100644
index ..387539c19344
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.13-configure-clang16.patch
@@ -0,0 +1,115 @@
+https://src.fedoraproject.org/rpms/xine-lib/blob/778d0883383a1e8ee4060b1d8583296812e077d4/f/xine-lib-configure-c99.patch
+
+configure: Add fake prototypes for C99 compatibility
+
+The xxmc-related configure probes assume that the compiler
+supports implicit function declarations because it tries to
+call the functions without including the appropriate headers,
+for link testing.
+
+As the headers are not determined yet at this point, use
+a fake prototype (the same that autoconf uses) to avoid
+the implicit function declarations.
+
+This avoids altering the outcome of these checks with future
+compilers which do not support implicit function declarations.
+
+Submitted upstream:
+
+  
+
+--- a/configure
 b/configure
+@@ -28563,7 +28563,7 @@ $as_echo "" >&6; }
+ LIBS="$XXMC_LIBS $X_LIBS $XV_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCPutSlice(void);
+ int
+ main ()
+ {
+@@ -28578,7 +28578,7 @@ else
+   LIBS="$XXMC_LIBS -lXvMC $X_LIBS $XV_LIBS $LIBS $DYNAMIC_LD_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCPutSlice(void);
+ int
+ main ()
+ {
+@@ -28616,7 +28616,7 @@ done
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCCreateContext(void);
+ int
+ main ()
+ {
+@@ -28631,7 +28631,7 @@ else
+   LIBS="$XXMC_LIBS -lXvMC $X_LIBS $XV_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCCreateContext(void);
+ int
+ main ()
+ {
+@@ -28675,7 +28675,7 @@ $as_echo "" >&6; }
+ LIBS="$XVMC_LIBS $X_LIBS $XV_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCCreateContext(void);
+ int
+ main ()
+ {
+@@ -28690,7 +28690,7 @@ else
+   LIBS="$XVMC_LIBS -lXvMC $X_LIBS $XV_LIBS $LIBS $DYNAMIC_LD_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++char XvMCCreateContext(void);
+ int
+ main ()
+ {
+--- a/m4/video_out.m4
 b/m4/video_out.m4
+@@ -496,9 +496,9 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
+ AC_MSG_CHECKING([whether to enable the xxmc plugin with VLD 
extensions])
+ AC_MSG_RESULT([])
+ LIBS="$XXMC_LIBS $X_LIBS $XV_LIBS $LIBS"
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[XvMCPutSlice()]])], 
[have_xxmc=yes],
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[char XvMCPutSlice(void);]], 
[[XvMCPutSlice()]])], [have_xxmc=yes],
+[LIBS="$XXMC_LIBS -lXvMC $X_LIBS $XV_LIBS $LIBS 
$DYNAMIC_LD_LIBS"
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], 
[[XvMCPutSlice()]])],
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[char 
XvMCPutSlice(void);]], [[XvMCPutSlice()]])],
+[have_xxmc=yes 
XXMC_LIBS="$XXMC_LIBS -lXvMC"])])
+ if test x"$have_xxmc" = x"yes"; then
+ AC_CHECK_HEADERS([X11/extensions/vldXvMC.h],
+@@ -506,9 +506,9 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
+   AC_DEFINE([HAVE_VLDXVMC], 1, [Define if you 
have vldXvMC.h])],
+   [have_vldexts=no])
+ else
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], 
[[XvMCCreateContext()]])], [have_xxmc=yes],
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[char 
XvMCCreateContext(void);]], [[XvMCCreateContext()]])], [have_xxmc=yes],
+[LIBS="$XXMC_LIBS -lXvMC $X_LIBS $XV_LIBS 
$LIBS"
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], 
[[XvMCCreateContext()]])],
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[char 
XvMCCreateContext(void);]], [[XvMCCreateContext()]])],
+[have_xxmc=yes 
XXMC_LIBS="$XXMC_LIBS -lXvMC"])])
+ fi
+ if test x"$have_xxmc" = x"yes"; then

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2023-01-25 Thread Sam James
commit: d652f91037cdf41a6e573dced77031d31ff21377
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 06:28:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 06:28:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d652f910

media-libs/xine-lib: add 1.2.13

Closes: https://bugs.gentoo.org/537350
Closes: https://bugs.gentoo.org/830554
Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/Manifest   |  1 +
 ...-lib-1.2..ebuild => xine-lib-1.2.13.ebuild} | 36 --
 media-libs/xine-lib/xine-lib-1.2..ebuild   | 36 --
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 64ab76b858d6..8d57c36528f1 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1 +1,2 @@
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B 
e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8
 SHA512 
cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
+DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 
8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942
 SHA512 
269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
similarity index 94%
copy from media-libs/xine-lib/xine-lib-1.2..ebuild
copy to media-libs/xine-lib/xine-lib-1.2.13.ebuild
index b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,25 +12,28 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
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/;
+HOMEPAGE="https://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-
-BDEPEND="
-   app-arch/xz-utils
-   >=sys-devel/libtool-2.2.6b
-   virtual/pkgconfig
+REQUIRED_USE="
+   vidix? ( || ( X fbcon ) )
+   wayland? ( opengl )
+   xv? ( X )
+   xinerama? ( X )
 "
+
 RDEPEND="
dev-libs/libxdg-basedir
media-libs/libdvdnav
@@ -61,7 +64,7 @@ RDEPEND="
virtual/glu
virtual/opengl
)
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
samba? ( net-fs/samba )
sftp? ( net-libs/libssh2 )
sdl? ( media-libs/libsdl )
@@ -78,7 +81,7 @@ RDEPEND="
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( media-libs/libva:=[X] )
+   vaapi? ( media-libs/libva:=[opengl,X] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:=[-minimal]
@@ -100,7 +103,8 @@ RDEPEND="
xv? ( x11-libs/libXv )
xvmc? ( x11-libs/libXvMC )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+   ${RDEPEND}
oss? ( virtual/os-headers )
v4l? ( virtual/os-headers )
X? (
@@ -111,10 +115,10 @@ DEPEND="${RDEPEND}
xvmc? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )
 "
-REQUIRED_USE="
-   vidix? ( || ( X fbcon ) )
-   xv? ( X )
-   xinerama? ( X )
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/libtool-2.2.6b
+   virtual/pkgconfig
 "
 
 src_prepare() {
@@ -214,7 +218,7 @@ src_configure() {
)
[[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 
-   econf "${myconf[@]}"
+   CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_compile() {

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,4 +1,4 @@
-# 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-11-12 Thread Matt Turner
commit: 9e63a383b0224f19297a76f9ffa782b9d05f1dcc
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:40:56 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:40:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e63a383

media-libs/xine-lib: Drop IUSE=ipv6

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index b20c57438e1a..b8b6b6b69e5d 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug 
musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l 
vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc 
${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
app-arch/xz-utils
@@ -152,6 +152,7 @@ src_configure() {
--disable-v4l
--disable-w32dll
--enable-avformat
+   --enable-ipv6
--with-external-dvdnav
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
@@ -170,7 +171,6 @@ src_configure() {
$(use_enable dxr3)
$(use_enable fbcon fb)
$(use_enable gtk gdkpixbuf)
-   $(use_enable ipv6)
$(use_enable jpeg libjpeg)
$(use_enable mad)
$(use_enable mmap)



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-11-12 Thread Matt Turner
commit: e3c43e40f46ade661b92917941e7852f9f032fa3
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:39:54 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:39:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c43e40

media-libs/xine-lib: Inherit multilib for has_multilib_profile

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index e7f02362fae7..2f42d1c56c87 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool
+inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2;

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 2935680fc418..b20c57438e1a 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool
+inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2;



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-11-12 Thread Arthur Zamarin
commit: 895ecb9eae6f7d4335572fc3c74557419a23eb12
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 12 16:06:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 12 16:06:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895ecb9e

media-libs/xine-lib: Stabilize 1.2.12-r4 ppc64, #868030

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index aca11c59fc03..e7f02362fae7 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-11-12 Thread Arthur Zamarin
commit: e4c6b6cc79c2918276a39b2d2340ce97aa2c4089
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 12 16:06:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 12 16:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c6b6cc

media-libs/xine-lib: Stabilize 1.2.12-r4 ppc, #868030

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index 9269a240c709..aca11c59fc03 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-11-04 Thread Sam James
commit: a4f31904fcf1fe0315d9ae68c6f6edf76df128d5
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  4 23:48:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 02:06:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f31904

media-libs/xine-lib: sync live

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index eeef0113e84e..9269a240c709 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -94,7 +94,7 @@ RDEPEND="
X? (
x11-libs/libX11
x11-libs/libXext
-   x11-libs/libxcb
+   x11-libs/libxcb:=
)
xinerama? ( x11-libs/libXinerama )
xv? ( x11-libs/libXv )

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 3b2359bfed24..2935680fc418 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic libtool
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-09-04 Thread Sam James
commit: f2e88f8a82210f2a2ec72e8ee49c6175e8f16800
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep  5 03:56:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep  5 03:56:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e88f8a

media-libs/xine-lib: Stabilize 1.2.12-r3 arm64, #868030

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
index 8ae90f978600..aa0cbc19cc29 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-09-02 Thread Sam James
commit: 2eaa773bd649e4fece28687ec5c2b56fa4cad218
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 05:26:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 05:26:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eaa773b

media-libs/xine-lib: Stabilize 1.2.12-r3 amd64, #868030

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
index 8b0659795844..8ae90f978600 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-09-02 Thread Sam James
commit: b00ef084c02c39690ba1f1c6a204d7a4fbbcbb7a
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 05:26:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 05:26:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00ef084

media-libs/xine-lib: Stabilize 1.2.12-r3 x86, #868030

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
index fe42a538dcfd..8b0659795844 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-07-20 Thread Matt Turner
commit: c7616cfc7597533a87daeb4db8e7983887273256
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jul 20 20:22:18 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jul 20 20:22:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7616cfc

media-libs/xine-lib: Drop dependence on libva[opengl]

Closes: https://bugs.gentoo.org/835469
Signed-off-by: Matt Turner  gentoo.org>

 .../xine-lib/{xine-lib-1.2.12-r2.ebuild => xine-lib-1.2.12-r3.ebuild}   | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
similarity index 99%
rename from media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
rename to media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
index ea732911944b..fe42a538dcfd 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
@@ -78,7 +78,7 @@ RDEPEND="
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( x11-libs/libva:0=[X,opengl] )
+   vaapi? ( x11-libs/libva:0=[X] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:0=[-minimal]

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index b276937acc11..83fc34a5b4ce 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -78,7 +78,7 @@ RDEPEND="
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( x11-libs/libva:0=[X,opengl] )
+   vaapi? ( x11-libs/libva:0=[X] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:0=[-minimal]



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-07-15 Thread David Seifert
commit: 7cac8f2bc9b9a1856035027083d7f948990beded
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jul 15 07:57:59 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jul 15 07:57:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cac8f2b

media-libs/xine-lib: altivec -> cpu_flags_ppc_altivec

Signed-off-by: David Seifert  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild | 4 ++--
 media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild | 4 ++--
 media-libs/xine-lib/xine-lib-1.2..ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
index de062653a998..d6b4b9882a0a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
@@ -24,7 +24,7 @@ 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 nfs opengl 
oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr 
vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dts dvb dxr3 fbcon 
flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 BDEPEND="
app-arch/xz-utils
@@ -162,7 +162,7 @@ src_configure() {
$(use_enable a52 a52dec)
$(use_enable aac faad)
$(use_enable aalib)
-   $(use_enable altivec)
+   $(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable bluray)
$(use_enable dts)
$(use_enable dvb)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
index bd9029dfd27e..ea732911944b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac 
gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug 
musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l 
vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc 
${NLS_IUSE}"
 
 BDEPEND="
app-arch/xz-utils
@@ -168,7 +168,7 @@ src_configure() {
$(use_enable a52 a52dec)
$(use_enable aac faad)
$(use_enable aalib)
-   $(use_enable altivec)
+   $(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable bluray)
$(use_enable dts)
$(use_enable dvb)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index e9acbf2c1072..b276937acc11 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dav1d dts dvb dxr3 fbcon flac 
gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 
fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug 
musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l 
vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc 
${NLS_IUSE}"
 
 BDEPEND="
app-arch/xz-utils
@@ -163,7 +163,7 @@ src_configure() {
$(use_enable a52 a52dec)
$(use_enable aac faad)
$(use_enable aalib)
-   $(use_enable altivec)
+   $(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable bluray)
$(use_enable dts)
$(use_enable dvb)



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-07-14 Thread David Seifert
commit: a74d59e6230ac5a274410ee69ff7f7f4c0ef7a3a
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jul 14 18:50:47 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jul 14 18:50:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74d59e6

media-libs/xine-lib: drop 1.2.10

Signed-off-by: David Seifert  gentoo.org>

 media-libs/xine-lib/Manifest   |   1 -
 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 224 -
 2 files changed, 225 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 3bf5c5935f9d..75064b0d3a47 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,2 @@
-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.12.tar.xz 5341212 BLAKE2B 
e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8
 SHA512 
cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be

diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
deleted file mode 100644
index 74bf35828731..
--- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool
-
-if [[ ${PV} == ** ]]; 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 nfs opengl 
oss pulseaudio samba sdl sftp speex theora truetype v4l vaapi vcd vdpau vdr 
vidix +vis vorbis vpx wavpack wayland +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 )
-   nfs? ( net-fs/libnfs:= )
-   opengl? (
-   virtual/glu
-   virtual/opengl
-   )
-   pulseaudio? ( media-sound/pulseaudio )
-   samba? ( net-fs/samba )
-   sftp? ( net-libs/libssh2 )
-   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 )
-   wayland? ( dev-libs/wayland )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libxcb
-   )
- 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-19 Thread Sam James
commit: be42b487bdbb8acdb5c3765710a3a785f2e38c9e
Author: Sam James  gentoo  org>
AuthorDate: Thu May 19 22:40:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 19 22:45:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be42b487

media-libs/xine-lib: disable dav1d for 1.2.11

1.2.12 has dav1d support enabled properly (and a patch for >= 1.0.0)
but in 1.2.11, it was automagic. Let's just disable it entirely
in 1.2.11 given that it fails to build and we've had to mask (for now)
1.2.12 because of crashes.

Closes: https://bugs.gentoo.org/846398
Bug: https://bugs.gentoo.org/835791
Bug: https://bugs.gentoo.org/845396
Signed-off-by: Sam James  gentoo.org>

 .../xine-lib/{xine-lib-1.2.11.ebuild => xine-lib-1.2.11-r1.ebuild}   | 5 +++--
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
similarity index 98%
rename from media-libs/xine-lib/xine-lib-1.2.11.ebuild
rename to media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
index 24c2b15d14e6..de062653a998 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -156,6 +156,7 @@ src_configure() {
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
--with-xv-path=/usr/$(get_libdir)
+   --without-dav1d
--without-esound
--without-fusionsound
$(use_enable a52 a52dec)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 4552c8b34a71..e9acbf2c1072 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -50,7 +50,7 @@ RDEPEND="
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/, media-libs/xine-lib/

2022-05-19 Thread Sam James
commit: 9983d4ae3ee5a688bd77b17e2a99ba33074b8a2f
Author: Sam James  gentoo  org>
AuthorDate: Thu May 19 22:43:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 19 22:45:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9983d4ae

media-libs/xine-lib: apply mmap crash fix

Applied upstream too! \o/

Closes: https://bugs.gentoo.org/845396
Thanks-to: aloe  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/xine-lib-1.2.12-fix-mmap-crash.patch |  15 ++
 media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild  | 234 +
 2 files changed, 249 insertions(+)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch
new file mode 100644
index ..df5515f0495c
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.12-fix-mmap-crash.patch
@@ -0,0 +1,15 @@
+https://sourceforge.net/p/xine/tickets/12/
+https://sourceforge.net/p/xine/xine-lib-1.2/ci/f56d70b45346ca9363a720724b0c2d00fc798988/tree/src/input/input_file.c?diff=d6e5d46a943257f0be171fb8ab16050810a21581
+https://bugs.gentoo.org/846398
+
+--- a/src/input/input_file.c
 b/src/input/input_file.c
+@@ -449,7 +449,7 @@
+ #ifdef HAVE_MMAP
+   this->mmap_base = NULL;
+   do {
+-uint8_t mmap_base;
++uint8_t *mmap_base;
+ size_t tmp_size;
+ /* may cause truncation - if it does, DON'T mmap! */
+ tmp_size = (size_t)sbuf.st_size;

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
new file mode 100644
index ..bd9029dfd27e
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool
+
+if [[ ${PV} == ** ]]; 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 ~riscv ~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 dav1d dts dvb dxr3 fbcon flac 
gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs 
opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau 
vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/libtool-2.2.6b
+   virtual/pkgconfig
+"
+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 )
+   dav1d? ( media-libs/dav1d:= )
+   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? ( media-libs/libjpeg-turbo:= )
+   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 )
+   nfs? ( net-fs/libnfs:= )
+   opengl? (
+   virtual/glu
+   virtual/opengl
+   )
+   pulseaudio? ( media-sound/pulseaudio )
+   samba? ( net-fs/samba )
+   sftp? ( net-libs/libssh2 )
+   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 )
+   wayland? ( dev-libs/wayland )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libxcb
+   )
+   xinerama? ( 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-05 Thread Agostino Sarubbo
commit: bd2bfc06c2481215ebac504d8919edb0819dfd9c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May  5 09:50:06 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May  5 09:50:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2bfc06

media-libs/xine-lib: x86 stable wrt bug #835838

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index cc70acf97c08..b25bf07dcef8 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-03 Thread Arthur Zamarin
commit: 5f4c3856dfcc29282494fccb7203b9f8d6f607cf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  3 17:48:31 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  3 17:48:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4c3856

media-libs/xine-lib: Stabilize 1.2.12-r1 ppc, #835838

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index e61cb7f10987..9c98e8a3acb1 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-03 Thread Arthur Zamarin
commit: 153155ba89f69901ae602e7ec26196c44564f877
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  3 17:48:34 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  3 17:48:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153155ba

media-libs/xine-lib: Stabilize 1.2.12-r1 ppc64, #835838

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index 9c98e8a3acb1..cc70acf97c08 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-03 Thread Arthur Zamarin
commit: 11205e9649d155db14d3b33d87f16500c13148e7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  3 17:48:02 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  3 17:48:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11205e96

media-libs/xine-lib: Stabilize 1.2.12-r1 arm64, #835838

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index 91e1f5d77228..e61cb7f10987 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-05-02 Thread Sam James
commit: 013bc2acb0a63ced11f52637ad4266bb3357
Author: Sam James  gentoo  org>
AuthorDate: Mon May  2 19:03:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  2 19:03:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013bc2ac

media-libs/xine-lib: Stabilize 1.2.12-r1 amd64, #835838

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index 29f22fbfac90..91e1f5d77228 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2022-03-15 Thread Alexis Ballier
commit: 9dee061cb91aa4f602788976a73e479544459042
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar 15 13:26:43 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar 15 13:27:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dee061c

media-libs/xine-lib: bump to 1.2.12

Closes: https://bugs.gentoo.org/831483
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 media-libs/xine-lib/Manifest  | 1 +
 .../xine-lib/{xine-lib-1.2..ebuild => xine-lib-1.2.12.ebuild} | 4 ++--
 media-libs/xine-lib/xine-lib-1.2..ebuild  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index d4d406cf057f..3bf5c5935f9d 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1,3 @@
 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.12.tar.xz 5341212 BLAKE2B 
e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8
 SHA512 
cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2.12.ebuild
similarity index 98%
copy from media-libs/xine-lib/xine-lib-1.2..ebuild
copy to media-libs/xine-lib/xine-lib-1.2.12.ebuild
index e683322d35dd..b3f3393bc258 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index e683322d35dd..b3f3393bc258 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-08-24 Thread Marek Szuba
commit: d0e5608a3b63d4dc0634295619938bd829d03d64
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 24 23:16:09 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Aug 25 00:10:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e5608a

media-libs/xine-lib: keyword 1.2.11 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 20e65d60692..24c2b15d14e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-05-16 Thread Sam James
commit: b1f783268228e0976a6b192a9ded5e4c3ceba1ff
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 18:57:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 18:57:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f78326

media-libs/xine-lib: Stabilize 1.2.11 arm64, #764401

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 813581de41f..20e65d60692 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-03-06 Thread Sergei Trofimovich
commit: 9e1d694e12fc4eb9f3b36ba8072f5899a9b1437b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar  6 21:37:10 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar  6 21:37:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1d694e

media-libs/xine-lib: stable 1.2.11 for ppc64

stable wrt bug #764401

Package-Manager: Portage-3.0.16, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 88ad09f0355..813581de41f 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-03-06 Thread Sergei Trofimovich
commit: 318fae63c3c25de044a7f261d5338f84865fb33c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar  6 21:35:56 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar  6 21:35:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318fae63

media-libs/xine-lib: stable 1.2.11 for ppc

stable wrt bug #764401

Package-Manager: Portage-3.0.16, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 9385bc83143..88ad09f0355 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-03-04 Thread Agostino Sarubbo
commit: 7a27c54131248390e2b161ed2fb0a761bcc77a8e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar  5 07:32:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar  5 07:32:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a27c541

media-libs/xine-lib: x86 stable wrt bug #764401

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 673cc6833b3..9385bc83143 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-03-04 Thread Agostino Sarubbo
commit: 5bb06541bd8cf19b0255d8fa907d3cc094cd686d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar  5 07:26:46 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar  5 07:26:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb06541

media-libs/xine-lib: amd64 stable wrt bug #764401

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index e683322d35d..673cc6833b3 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2021-03-03 Thread Sam James
commit: 3085007548ea60ffbea0b6d04d285acccdd96c18
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  9 04:52:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  4 01:44:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30850075

media-libs/xine-lib: fix automagic on nfs, libssh2, wayland

Closes: #19000
Closes: https://bugs.gentoo.org/761445
Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/metadata.xml |  6 ++
 media-libs/xine-lib/xine-lib-1.2.10.ebuild   | 10 --
 media-libs/xine-lib/xine-lib-1.2.11.ebuild   | 10 --
 media-libs/xine-lib/xine-lib-1.2..ebuild | 10 --
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index dddaa6727e7..e793509c28b 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -35,6 +35,9 @@
the file's data. mmap() access should be faster, but 
might misbehave if the
device where the file resides in is removed during 
playback.

+   
+   Allow accessing NFS shares via net-fs/libnfs.
+   

Use media-libs/freetype for font rendering 
and
media-libs/fontconfig for font discovery. 
Enabling this USE flag
@@ -43,6 +46,9 @@
is still experimental, and might not be as good looking 
as the bitmap fonts
used with this USE flag disabled.

+   
+   Use net-libs/libssh2 to access SFTP servers.
+   

Build the VDR plugin


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 49cb170173d..74bf3582873 100644
--- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ 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}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk 
imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl 
oss pulseaudio samba sdl sftp speex theora truetype v4l vaapi vcd vdpau vdr 
vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -50,12 +50,14 @@ RDEPEND="${NLS_RDEPEND}
mng? ( media-libs/libmng:= )
modplug? ( >=media-libs/libmodplug-0.8.8.1 )
musepack? ( >=media-sound/musepack-tools-444 )
+   nfs? ( net-fs/libnfs:= )
opengl? (
virtual/glu
virtual/opengl
)
pulseaudio? ( media-sound/pulseaudio )
samba? ( net-fs/samba )
+   sftp? ( net-libs/libssh2 )
sdl? ( media-libs/libsdl )
speex? (
media-libs/libogg
@@ -82,6 +84,7 @@ RDEPEND="${NLS_RDEPEND}
)
vpx? ( media-libs/libvpx:0= )
wavpack? ( media-sound/wavpack )
+   wayland? ( dev-libs/wayland )
X? (
x11-libs/libX11
x11-libs/libXext
@@ -170,10 +173,12 @@ src_configure() {
$(use_enable mng)
$(use_enable modplug)
$(use_enable musepack)
+   $(use_enable nfs)
$(use_enable opengl)
$(use_enable opengl glu)
$(use_enable oss)
$(use_enable samba)
+   $(use_enable sftp)
$(use_enable v4l libv4l)
$(use_enable v4l v4l2)
$(use_enable vaapi)
@@ -185,6 +190,7 @@ src_configure() {
$(use_enable vcd)
$(use_enable vdr)
$(use_enable vpx)
+   $(use_enable wayland)
$(use_with alsa)
$(use_with flac libflac)
$(use_with imagemagick)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 1b99ceacbd4..e683322d35d 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2020-12-20 Thread Sam James
commit: ca669a43b72f0f87b80765b5fde418d1e8c658f1
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 20 17:33:12 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 20 17:35:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca669a43

media-libs/xine-lib: cleanup old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/Manifest   |   1 -
 .../files/xine-lib-1.2.6-imagemagick7.patch|  13 --
 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild   | 222 -
 3 files changed, 236 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 733501c0d65..d4d406cf057 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,2 @@
 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

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 3406e32..000
--- 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.9-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
deleted file mode 100644
index f1ccbed7984..000
--- 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} == ** ]]; 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? (
-   

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-20 Thread Thomas Deutschmann
commit: c90d359fc75772fc3ca6fabbd70fc7bcada7ecdd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Dec 20 16:39:54 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Dec 20 16:39:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90d359f

media-libs/xine-lib: x86 stable (bug #760345)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a8fa37374f1..49cb170173d 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} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-18 Thread Sergei Trofimovich
commit: 419b9889f35092c36907f9de1243e09000656a42
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 18 10:19:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 18 10:25:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419b9889

media-libs/xine-lib: stable 1.2.10 for ppc64

stable wrt bug #760345

Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1c6c377268c..a8fa37374f1 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} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-16 Thread Sam James
commit: cee926e84269f3d538687b5d2bd2fb1e0735d90e
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 17 07:48:12 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 17 07:48:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee926e8

media-libs/xine-lib: Stabilize 1.2.10 ppc, #760345

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bce1e53402c..94549c1eedb 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} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-16 Thread Sam James
commit: 41dc3455a8971df6b3a4df254342fac4917cecc5
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 17 05:32:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 17 05:32:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dc3455

media-libs/xine-lib: Stabilize 1.2.10 arm64, #760345

Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bf3fbf83a91..bce1e53402c 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} == ** ]]; 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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-06 Thread Sam James
commit: da766d5117ac92b2610e8881b01da81e8c970e38
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  6 20:25:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  6 20:26:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da766d51

media-libs/xine-lib: fix MissingSlash(!)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.11.ebuild   | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 3a8cecc751b..1b99ceacbd4 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -216,5 +216,5 @@ src_compile() {
 src_install() {
default
find "${D}" -name '*.la' -delete || die
-   rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
+   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
 }

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 3a8cecc751b..1b99ceacbd4 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -216,5 +216,5 @@ src_compile() {
 src_install() {
default
find "${D}" -name '*.la' -delete || die
-   rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
+   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-12-06 Thread Sam James
commit: 5c4097965e56cc55161b628ed3efdbe407489418
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  6 19:48:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  6 19:49:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c409796

media-libs/xine-lib: bump to 1.2.11

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-libs/xine-lib/Manifest   |  1 +
 .../{xine-lib-1.2..ebuild => xine-lib-1.2.11.ebuild}   | 10 ++
 media-libs/xine-lib/xine-lib-1.2..ebuild   | 10 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 1505c386972..733501c0d65 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
similarity index 99%
copy from media-libs/xine-lib/xine-lib-1.2..ebuild
copy to media-libs/xine-lib/xine-lib-1.2.11.ebuild
index bf3fbf83a91..3a8cecc751b 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool
 
@@ -26,6 +26,11 @@ 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}"
 
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/libtool-2.2.6b
+   virtual/pkgconfig
+"
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
@@ -93,9 +98,6 @@ RDEPEND="${NLS_RDEPEND}
 "
 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? (

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index bf3fbf83a91..3a8cecc751b 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool
 
@@ -26,6 +26,11 @@ 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}"
 
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/libtool-2.2.6b
+   virtual/pkgconfig
+"
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
@@ -93,9 +98,6 @@ RDEPEND="${NLS_RDEPEND}
 "
 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? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-09-04 Thread Alexis Ballier
commit: 2622cc157f982b9458fa09ba13399bdf6e4fb64e
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Sep  4 15:51:08 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Sep  4 16:47:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2622cc15

media-libs/xine-lib: bump to 1.2.10

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Alexis Ballier  gentoo.org>

 media-libs/xine-lib/Manifest   |   1 +
 media-libs/xine-lib/xine-lib-1.2.10.ebuild | 218 +
 2 files changed, 219 insertions(+)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e46a8944ee3..1505c386972 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1 +1,2 @@
+DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B 
e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af
 SHA512 
1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 
43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7
 SHA512 
bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c

diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
new file mode 100644
index 000..bf3fbf83a91
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
@@ -0,0 +1,218 @@
+# 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} == ** ]]; 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
+ 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-04-26 Thread David Seifert
commit: 08ed84d0fee0ef1ce069c42453a28d7fc28248c5
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 26 12:04:39 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 26 12:04:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ed84d0

media-libs/xine-lib: Remove media-video/libav

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 13 +++--
 media-libs/xine-lib/xine-lib-1.2..ebuild | 13 +++--
 2 files changed, 6 insertions(+), 20 deletions(-)

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
index 57cd4e37dc9..f1ccbed7984 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -24,11 +24,12 @@ 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 libav 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}"
+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 )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav:0=
-   )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -154,6 +150,7 @@ src_configure() {
--disable-real-codecs
--disable-v4l
--disable-w32dll
+   --enable-avformat
--with-external-dvdnav
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
@@ -210,10 +207,6 @@ src_configure() {
)
[[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 
-   if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-   myconf+=( --enable-avformat ) #507474
-   fi
-
econf "${myconf[@]}"
 }
 

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index e8d87db18ee..bf3fbf83a91 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,11 +24,12 @@ 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 libav 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}"
+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 )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav:0=
-   )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -150,6 +146,7 @@ src_configure() {
--disable-real-codecs
--disable-v4l
--disable-w32dll
+   --enable-avformat
--with-external-dvdnav
--with-real-codecs-path=/usr/$(get_libdir)/codecs
--with-w32-path=${win32dir}
@@ -206,10 +203,6 @@ src_configure() {
)
[[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 
-   if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-   myconf+=( --enable-avformat ) #507474
-   fi
-
econf "${myconf[@]}"
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2020-01-23 Thread Matt Turner
commit: 2a2948d65302f92f6286481cc87520b5ce467675
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 23 19:14:49 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Jan 23 19:17:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2948d6

media-libs/xine-lib: Drop IUSE=xcb

Closes: https://bugs.gentoo.org/705442
Signed-off-by: Matt Turner  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 6 +++---
 media-libs/xine-lib/xine-lib-1.2..ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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
index b5af0deb05e..e5eb776f19e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -24,7 +24,7 @@ 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 libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk 
imagemagick ipv6 jack jpeg libav 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
@@ -89,8 +89,8 @@ RDEPEND="${NLS_RDEPEND}
X? (
x11-libs/libX11
x11-libs/libXext
+   x11-libs/libxcb
)
-   xcb? ( x11-libs/libxcb )
xinerama? ( x11-libs/libXinerama )
xv? ( x11-libs/libXv )
xvmc? ( x11-libs/libXvMC )
@@ -206,7 +206,7 @@ src_configure() {
$(use_with vorbis)
$(use_with wavpack)
$(use_with X x)
-   $(use_with xcb)
+   $(use_with X xcb)
)
[[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 585781521f8..d2a65ff9376 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,7 +24,7 @@ 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 libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk 
imagemagick ipv6 jack jpeg libav 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
@@ -89,8 +89,8 @@ RDEPEND="${NLS_RDEPEND}
X? (
x11-libs/libX11
x11-libs/libXext
+   x11-libs/libxcb
)
-   xcb? ( x11-libs/libxcb )
xinerama? ( x11-libs/libXinerama )
xv? ( x11-libs/libXv )
xvmc? ( x11-libs/libXvMC )
@@ -202,7 +202,7 @@ src_configure() {
$(use_with vorbis)
$(use_with wavpack)
$(use_with X x)
-   $(use_with xcb)
+   $(use_with X xcb)
)
[[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2019-07-24 Thread Aaron Bauman
commit: 8039dfa0b30c8ee986eaf35dc55a958ac9e0ee01
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Jul 24 20:50:04 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jul 24 20:56:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8039dfa0

media-libs/xine-lib: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index ffafb74e695..d0dac86ff29 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 42ef6ff89001c85299204c8934749bd1020a9ea6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:40:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ef6ff8

media-libs/xine-lib: Drop superfluous multilib inherit

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 7b117ee415d..259b970d453 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic libtool multilib
+inherit flag-o-matic libtool
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: ad1bdbdda967be43e646c7e45c9b4af74e46b836
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:35:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1bdbdd

media-libs/xine-lib: Drop USE fusionsound and DirectFB from DEPENDs

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/metadata.xml | 3 ---
 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 5 ++---
 media-libs/xine-lib/xine-lib-1.2..ebuild | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 9d10869197e..18cafd44590 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -18,9 +18,6 @@
container (OggFLAC), but might have better support for 
exotic features like
24-bit samples or 96kHz sample rates.

-   
-   Enable support for the Fusion audio sub system
-   

Build the gdkpixbuf-based image decoder plugin.


diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 8b7764e2471..d1f4ebf4035 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk 
imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -40,7 +40,6 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( virtual/imagemagick-tools )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -156,6 +155,7 @@ src_configure() {
--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)
@@ -190,7 +190,6 @@ src_configure() {
$(use_enable vpx)
$(use_with alsa)
$(use_with flac libflac)
-   $(use_with fusionsound)
$(use_with imagemagick)
$(use_with jack)
$(use_with libcaca caca)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 74831e6450b..7b117ee415d 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk 
imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -40,7 +40,6 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( virtual/imagemagick-tools )
jack? ( virtual/jack )
@@ -152,6 +151,7 @@ src_configure() {
--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)
@@ -186,7 +186,6 @@ src_configure() {
$(use_enable vpx)
$(use_with alsa)
  

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 44622b9da03fa693f8f4dec41f723c147b992f82
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:58:39 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44622b9d

media-libs/xine-lib: Add sys-libs/zlib slot op

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 5e471e90bff..2ffc5f5e71b 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -29,7 +29,7 @@ IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 
fbcon flac gtk imagem
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
-   sys-libs/zlib
+   sys-libs/zlib:=
virtual/libiconv
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 83d113887151ce24211c21ebffc17d48813d2b73
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:45:34 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d11388

media-libs/xine-lib: Fix EHG_REPO_URI after upstream move

Thanks-to: Andreas Fink  web.de>
Closes: https://bugs.gentoo.org/655838
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 259b970d453..1281812e3dd 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic libtool
 
 if [[ ${PV} == ** ]]; then
-   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
+   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"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: d5d2e939e35c65696b525f8e4e8b236dd9256850
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 21:12:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d2e939

media-libs/xine-lib: Sort DEPENDs

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 32 
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index f14e49f7b7c..07cffc7a62f 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -48,7 +48,7 @@ RDEPEND="${NLS_RDEPEND}
libav? (
media-libs/libpostproc:0=
media-video/libav:0=
-   )
+   )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng:= )
@@ -57,60 +57,64 @@ RDEPEND="${NLS_RDEPEND}
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
-   )
+   )
xcb? ( x11-libs/libxcb )
xinerama? ( x11-libs/libXinerama )
xv? ( x11-libs/libXv )
-   xvmc? ( x11-libs/libXvMC )"
+   xvmc? ( x11-libs/libXvMC )
+"
 DEPEND="${RDEPEND}
${NLS_DEPEND}
app-arch/xz-utils
-   virtual/pkgconfig
>=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 ) )
+   xinerama? ( x11-base/xorg-proto )
+"
+REQUIRED_USE="
+   vidix? ( || ( X fbcon ) )
xv? ( X )
-   xinerama? ( X )"
+   xinerama? ( X )
+"
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 587248a675586496bc163e567aa41f55ffb78154
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 21:38:41 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587248a6

media-libs/xine-lib: Drop 1.2.9-r1

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 225 ---
 1 file changed, 225 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
deleted file mode 100644
index d1f4ebf4035..000
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == ** ]]; then
-   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/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 ~amd64-fbsd ~x86-fbsd"
-   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 libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-   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? ( >=media-sound/jack-audio-connection-kit-0.100 )
-   jpeg? ( virtual/jpeg:0 )
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav: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
-   )
-   xcb? ( x11-libs/libxcb )
-   xinerama? ( x11-libs/libXinerama )
-   xv? ( x11-libs/libXv )
-   xvmc? ( x11-libs/libXvMC )"
-DEPEND="${RDEPEND}
-   ${NLS_DEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   >=sys-devel/libtool-2.2.6b
-   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}" = ** ]] ; then
-   eautoreconf
-   else
-   elibtoolize
-   fi
-
-   local x
-  

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 4c49abac288ea3112a34c56e6be3fbf41cafece5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 21:18:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c49abac

media-libs/xine-lib: Switch USE=jack to virtual/jack, dep fixes

Reported-by: Daniel Bautista  gmail.com>
Tested-by: Anton Gubarkov  gmail.com>
Closes: https://bugs.gentoo.org/637466
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild | 229 +++
 1 file changed, 229 insertions(+)

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
new file mode 100644
index 000..ffafb74e695
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool
+
+if [[ ${PV} == ** ]]; 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 ~amd64-fbsd ~x86-fbsd"
+   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 libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+   dev-libs/libxdg-basedir
+   media-libs/libdvdnav
+   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 )
+   !libav? ( media-video/ffmpeg:0= )
+   libav? (
+   media-libs/libpostproc:0=
+   media-video/libav: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
+   )
+   xcb? ( 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}" = ** ]] ; then
+   eautoreconf
+   else
+  

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 3503741134d72c98f11c65f47c74581260976632
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:52:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35037411

media-libs/xine-lib: Add missing || die

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 1281812e3dd..5e471e90bff 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -217,5 +217,5 @@ src_compile() {
 src_install() {
default
find "${D}" -name '*.la' -delete || die
-   rm -f "${ED}"usr/share/doc/${PF}/COPYING
+   rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 05259755af5bfc72e415ddcfaf2a80b4778a3109
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 21:02:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05259755

media-libs/xine-lib: Add media-libs/libmng slot op

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 2ffc5f5e71b..f14e49f7b7c 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -51,7 +51,7 @@ RDEPEND="${NLS_RDEPEND}
)
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
-   mng? ( media-libs/libmng )
+   mng? ( media-libs/libmng:= )
modplug? ( >=media-libs/libmodplug-0.8.8.1 )
musepack? ( >=media-sound/musepack-tools-444 )
opengl? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-08-13 Thread Andreas Sturmlechner
commit: 0d4f7e67a41c974b1026ebcc6323f3cd2daf0870
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 13 20:34:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 13 21:40:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d4f7e67

media-libs/xine-lib: Switch USE=jack to virtual/jack

Bug: https://bugs.gentoo.org/637466
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 053e16e2838..74831e6450b 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -43,7 +43,7 @@ RDEPEND="${NLS_RDEPEND}
fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( virtual/imagemagick-tools )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+   jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
!libav? ( media-video/ffmpeg:0= )
libav? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/

2018-07-11 Thread Tony Vroon
commit: 1688ed671ae14234075f79fce6428d141c31ba7b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jul  8 08:10:57 2018 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Wed Jul 11 11:38:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1688ed67

media-libs/xine-lib: remove unused patches

 media-libs/xine-lib/files/ffmpeg29.patch   | 44 --
 .../files/xine-lib-1.2.6-libxcb-1.12.patch | 25 
 .../xine-lib/files/xine-lib-1.2.6-sysmacros.patch  | 15 
 3 files changed, 84 deletions(-)

diff --git a/media-libs/xine-lib/files/ffmpeg29.patch 
b/media-libs/xine-lib/files/ffmpeg29.patch
deleted file mode 100644
index a220483218c..000
--- a/media-libs/xine-lib/files/ffmpeg29.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-===
 xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
-   int got_frame;
-   float gain = this->class->gain;
-   if (!this->av_frame)
--this->av_frame = avcodec_alloc_frame ();
-+this->av_frame = av_frame_alloc ();
- 
-   consumed = avcodec_decode_audio4 (this->context, this->av_frame, 
_frame, );
-   if ((consumed >= 0) && got_frame) {
-@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
-   /* try to reset the wma decoder */
-   if( this->decoder_ok ) {
- #if AVAUDIO > 3
--avcodec_free_frame (>av_frame);
-+av_frame_free (>av_frame);
- #endif
- pthread_mutex_lock (_lock);
- avcodec_close (this->context);
-@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
- 
-   if( this->context && this->decoder_ok ) {
- #if AVAUDIO > 3
--avcodec_free_frame (>av_frame);
-+av_frame_free (>av_frame);
- #endif
- pthread_mutex_lock (_lock);
- avcodec_close (this->context);
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-===
 xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
-   this->stream= stream;
-   this->class = (ff_video_class_t *) class_gen;
- 
--  this->av_frame  = avcodec_alloc_frame();
-+  this->av_frame  = av_frame_alloc();
-   this->context   = avcodec_alloc_context();
-   this->context->opaque   = this;
- #if AVPALETTE == 1

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
deleted file mode 100644
index cc17643d9c5..000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.xine-project.org/show_bug.cgi?id=572
-https://bugs.gentoo.org/584640
-
 xine-lib-1.2.6/m4/video_out.m4
-+++ xine-lib-1.2.6/m4/video_out.m4
-@@ -305,7 +305,7 @@
- dnl xcb
- XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
- if test x"$with_xcb" != x"no"; then
--PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], 
[have_xcb=no])
-+PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], 
[have_xcb=no])
- if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; 
then
- AC_MSG_ERROR([XCB support requested, but XCB not found])
- elif test x"$have_xcb" = x"yes"; then
 xine-lib-1.2.6/src/video_out/Makefile.am
-+++ xine-lib-1.2.6/src/video_out/Makefile.am
-@@ -147,7 +147,7 @@
- xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) 
$(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
- 
- xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
--xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) 
$(XCBXV_LIBS) $(XCB_LIBS)
-+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) 
$(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
- xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
- 
- xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
deleted file mode 100644
index a7168d5b450..000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix build w/newer glibc due to major/minor includes being dropped from 
sys/types.h
-
-https://bugs.gentoo.org/580012
-https://bugs.xine-project.org/show_bug.cgi?id=574
-
 a/src/xine-utils/xine_check.c
-+++ b/src/xine-utils/xine_check.c
-@@ -55,6 +55,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-06-16 Thread Pacho Ramos
commit: 4b59ddb2482381a4d269d3f7e2a13ceb04073207
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 16 18:02:45 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 16 18:02:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b59ddb2

media-libs/xine-lib: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/xine-lib/Manifest |   1 -
 media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild | 227 ---
 2 files changed, 228 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 37e153d1fd2..e46a8944ee3 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1 @@
-DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 
832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7
 SHA512 
ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 
43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7
 SHA512 
bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
deleted file mode 100644
index 085547073ef..000
--- a/media-libs/xine-lib/xine-lib-1.2.6-r2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool multilib eutils
-
-if [[ ${PV} == ** ]]; then
-   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
-   inherit mercurial eutils
-   unset NLS_IUSE
-   NLS_DEPEND="sys-devel/gettext"
-   NLS_RDEPEND="virtual/libintl"
-else
-   KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-   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 directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-   sys-libs/zlib
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav:0=
-   )
-   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 )
-   directfb? ( dev-libs/DirectFB )
-   dts? ( media-libs/libdca )
-   dxr3? ( media-libs/libfame )
-   flac? ( media-libs/flac )
-   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-   gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( virtual/imagemagick-tools )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-   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 )
-   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
-   )
-   xcb? ( x11-libs/libxcb )
-   xinerama? ( x11-libs/libXinerama )
-   xv? ( x11-libs/libXv )

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-05-09 Thread Lars Wendler
commit: e970e15bc81360ec166ff4868be2133d3fabe02b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May  9 07:46:19 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May  9 07:46:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e970e15b

media-libs/xine-lib: Removed old.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-libs/xine-lib/Manifest  |   1 -
 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 226 -
 media-libs/xine-lib/xine-lib-1.2.9.ebuild | 230 --
 3 files changed, 457 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 91ea9b0eafb..37e153d1fd2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,2 @@
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 
832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7
 SHA512 
ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
-DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B 
e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829
 SHA512 
ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 
43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7
 SHA512 
bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
deleted file mode 100644
index 09a56a22a57..000
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool multilib eutils
-
-if [[ ${PV} == ** ]]; then
-   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
-   inherit mercurial eutils
-   unset NLS_IUSE
-   NLS_DEPEND="sys-devel/gettext"
-   NLS_RDEPEND="virtual/libintl"
-else
-   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-   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 directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-   sys-libs/zlib
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav:0=
-   )
-   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 )
-   directfb? ( dev-libs/DirectFB )
-   dts? ( media-libs/libdca )
-   dxr3? ( media-libs/libfame )
-   flac? ( media-libs/flac )
-   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-   gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( virtual/imagemagick-tools )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-   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[X,opengl] )
-   vcd? (
-   >=media-video/vcdimager-0.7.23
-   dev-libs/libcdio:0=[-minimal]
-   )
-   vdpau? ( 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-03-22 Thread Sergei Trofimovich
commit: c767be1f25f3361c8ed698bb1b9eae33322a1371
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Mar 22 22:53:55 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Mar 22 22:53:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c767be1f

media-libs/xine-lib: stable 1.2.9-r1 for ppc64, bug #642500

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 9e220e33df8..b3fd25d6f7a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-03-18 Thread Sergei Trofimovich
commit: f5077ab74698a395f3d9ae4ab3c58791559f1c87
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 18 22:52:33 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 18 22:52:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5077ab7

media-libs/xine-lib: stable 1.2.9-r1 for ppc, bug #642500

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 0f29cf20ff7..9e220e33df8 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-02-25 Thread Thomas Deutschmann
commit: 285f497801e0c54f7fff684e1f68c430f53223fc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 25 18:17:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 25 18:17:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285f4978

media-libs/xine-lib: x86 stable (bug #642500)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 4a30e178bf1..0f29cf20ff7 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-02-22 Thread Jason Zaman
commit: 7d55faa6ff574fd9b8ad5f02e110421b1aca08e6
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Feb 22 08:09:46 2018 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Feb 22 09:15:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d55faa6

media-libs/xine-lib: amd64 stable

Gentoo-bug: 642500
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 1b7e31b6ffc..4a30e178bf1 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-02-14 Thread Pacho Ramos
commit: 68e86a40756665dfa11d171dcefcf4e373c53759
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Feb 14 19:27:53 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Feb 14 20:04:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e86a40

media-libs/xine-lib: Drop directfb support (#642500), slot operator needed for 
libva (#641634), really drop .la files and COPYING file.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...e-lib-1.2..ebuild => xine-lib-1.2.9-r1.ebuild} | 19 ++-
 media-libs/xine-lib/xine-lib-1.2..ebuild  | 15 ++-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
similarity index 89%
copy from media-libs/xine-lib/xine-lib-1.2..ebuild
copy to media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
index 8e2f4aec796..1b7e31b6ffc 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
alsa? ( media-libs/alsa-lib )
bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
-   directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
@@ -76,7 +75,7 @@ RDEPEND="${NLS_RDEPEND}
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( x11-libs/libva[X,opengl] )
+   vaapi? ( x11-libs/libva:0=[X,opengl] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:0=[-minimal]
@@ -118,6 +117,10 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 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}" = ** ]] ; then
@@ -143,6 +146,7 @@ src_configure() {
fi
 
local myconf=(
+   --disable-directfb
--disable-gnomevfs
--disable-optimizations
--disable-real-codecs
@@ -158,7 +162,6 @@ src_configure() {
$(use_enable aalib)
$(use_enable altivec)
$(use_enable bluray)
-   $(use_enable directfb)
$(use_enable dts)
$(use_enable dvb)
$(use_enable dxr3)
@@ -218,9 +221,7 @@ src_compile() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
-
-   rm -f \
-   "${ED%/}"usr/lib*/libxine*.la \
-   "${ED%/}"usr/share/doc/${PF}/COPYING
+   default
+   find "${D}" -name '*.la' -delete || die
+   rm -f "${ED}"usr/share/doc/${PF}/COPYING
 }

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 8e2f4aec796..7938ae7f0b1 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
alsa? ( media-libs/alsa-lib )
bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
-   directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-02-06 Thread Thomas Deutschmann
commit: 7086ac1f1af8426ba17cc4ac2556f93558f74308
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Feb  6 16:20:30 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Feb  6 16:24:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7086ac1f

media-libs/xine-lib: x86 stable (bug #639992)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 5bcd9a57d22..09a56a22a57 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-01-13 Thread Lars Wendler
commit: 3d25e7e077af29a85d1c462405a146a5314cb9e2
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 13 12:46:58 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 13 12:46:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d25e7e0

media-libs/xine-lib: Minor ebuild improvements.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-libs/xine-lib/xine-lib-1.2.9.ebuild| 152 ++-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 149 +-
 2 files changed, 152 insertions(+), 149 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.9.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
index b5083eb0033..993b8a7a53e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic libtool multilib eutils
+inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
-   inherit mercurial eutils
+   inherit autotools mercurial
unset NLS_IUSE
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
@@ -30,11 +30,6 @@ RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
media-libs/libdvdnav
sys-libs/zlib
-   !libav? ( media-video/ffmpeg:0= )
-   libav? (
-   media-libs/libpostproc:0=
-   media-video/libav:0=
-   )
virtual/libiconv
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
@@ -51,6 +46,11 @@ RDEPEND="${NLS_RDEPEND}
imagemagick? ( virtual/imagemagick-tools )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
+   !libav? ( media-video/ffmpeg:0= )
+   libav? (
+   media-libs/libpostproc:0=
+   media-video/libav:0=
+   )
libcaca? ( media-libs/libcaca )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng )
@@ -124,7 +124,11 @@ src_prepare() {
 
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' 
src/vdr/input_vdr.c || die
 
-   eautoreconf
+   if [[ "${PV}" = ** ]] ; then
+   eautoreconf
+   else
+   elibtoolize
+   fi
 
local x
for x in 0 1 2 3; do
@@ -142,70 +146,74 @@ src_configure() {
win32dir=/usr/$(get_libdir)/win32
fi
 
-   local myconf=()
-   [[ ${PV} == ** ]] || myconf=( $(use_enable nls) )
+   local myconf=(
+   --disable-gnomevfs
+   --disable-optimizations
+   --disable-real-codecs
+   --disable-v4l
+   --disable-w32dll
+   --with-external-dvdnav
+   --with-real-codecs-path=/usr/$(get_libdir)/codecs
+   --with-w32-path=${win32dir}
+   --with-xv-path=/usr/$(get_libdir)
+   --without-esound
+   $(use_enable a52 a52dec)
+   $(use_enable aac faad)
+   $(use_enable aalib)
+   $(use_enable altivec)
+   $(use_enable bluray)
+   $(use_enable directfb)
+   $(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 fusionsound)
+   $(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 xcb)
+   )
+   [[ ${PV} == ** ]] || myconf+=( $(use_enable nls) )
 
if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
myconf+=( 

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2018-01-13 Thread Alexis Ballier
commit: b5ad239415882625ce1dc89fd2f3a4e7deec8551
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 13 11:58:54 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 13 12:16:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ad2394

media-libs/xine-lib: bump to 1.2.9

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-libs/xine-lib/Manifest  |   1 +
 media-libs/xine-lib/xine-lib-1.2.9.ebuild | 226 ++
 2 files changed, 227 insertions(+)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 7ae11a6bdda..91ea9b0eafb 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1,3 @@
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 
832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7
 SHA512 
ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B 
e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829
 SHA512 
ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
+DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 
43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7
 SHA512 
bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c

diff --git a/media-libs/xine-lib/xine-lib-1.2.9.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
new file mode 100644
index 000..b5083eb0033
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool multilib eutils
+
+if [[ ${PV} == ** ]]; then
+   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
+   inherit mercurial eutils
+   unset NLS_IUSE
+   NLS_DEPEND="sys-devel/gettext"
+   NLS_RDEPEND="virtual/libintl"
+else
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   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 directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+   dev-libs/libxdg-basedir
+   media-libs/libdvdnav
+   sys-libs/zlib
+   !libav? ( media-video/ffmpeg:0= )
+   libav? (
+   media-libs/libpostproc:0=
+   media-video/libav:0=
+   )
+   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 )
+   directfb? ( dev-libs/DirectFB )
+   dts? ( media-libs/libdca )
+   dxr3? ( media-libs/libfame )
+   flac? ( media-libs/flac )
+   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
+   gtk? ( x11-libs/gdk-pixbuf:2 )
+   imagemagick? ( virtual/imagemagick-tools )
+   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+   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[X,opengl] )
+   vcd? (
+   >=media-video/vcdimager-0.7.23
+   dev-libs/libcdio:0=[-minimal]
+   )
+   vdpau? ( x11-libs/libvdpau )
+   vorbis? (
+   media-libs/libogg
+  

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-12-28 Thread Sergei Trofimovich
commit: 604e435865e1ac616fd8c29fbaeed4dd76bf0f76
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Dec 28 12:39:51 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 28 12:39:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604e4358

media-libs/xine-lib: stable 1.2.8 for ppc64, bug #639992

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"

 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 12c1d878d5b..5bcd9a57d22 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-12-27 Thread Sergei Trofimovich
commit: da8ad5121392609baa9a06f3bf8cfbc12dab8a00
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Dec 27 23:45:18 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 27 23:45:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8ad512

media-libs/xine-lib: stable 1.2.8 for ppc, bug #639992

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index d3a4b7e7656..12c1d878d5b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-12-18 Thread Jason Zaman
commit: 59e184d81217d5fed1c9cf43bbe4e750cfc8a845
Author: Jason Zaman  gentoo  org>
AuthorDate: Tue Dec 19 05:08:10 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Dec 19 05:15:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e184d8

media-libs/xine-lib: amd64 stable

Gentoo-bug: 639992
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index a2171f2e621..d3a4b7e7656 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-07-03 Thread Alexis Ballier
commit: a803667f7418ccf11e04607eef64871c18f4b352
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jul  3 08:56:18 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jul  3 09:11:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a803667f

media-libs/xine-lib: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/xine-lib/xine-lib-1.2.8.ebuild| 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 1d16009550a..a2171f2e621 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
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..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index bad705fa7a6..a7d83b367fa 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
 else
-   KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
NLS_IUSE="nls"
NLS_DEPEND="nls? ( sys-devel/gettext )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-06-26 Thread Alexis Ballier
commit: 8f1cc5877612178c304a17b4de835bad7c5a18a6
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 26 16:20:58 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 26 16:21:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1cc587

media-libs/xine-lib: Fix usedep requirements on libva.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/xine-lib/xine-lib-1.2.8.ebuild| 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index c2642d2f5c1..1d16009550a 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -76,7 +76,7 @@ RDEPEND="${NLS_RDEPEND}
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( x11-libs/libva )
+   vaapi? ( x11-libs/libva[X,opengl] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:0=[-minimal]

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 559e6402aa9..bad705fa7a6 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -76,7 +76,7 @@ RDEPEND="${NLS_RDEPEND}
media-libs/freetype:2
)
v4l? ( media-libs/libv4l )
-   vaapi? ( x11-libs/libva )
+   vaapi? ( x11-libs/libva[X,opengl] )
vcd? (
>=media-video/vcdimager-0.7.23
dev-libs/libcdio:0=[-minimal]



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2017-05-23 Thread Lars Wendler
commit: 99dc1b4f413426dfde42805f427c1603839986ed
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue May 23 08:54:30 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May 23 08:54:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dc1b4f

media-libs/xine-lib: Fixed build with imagemagick-7 (bug #581820).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch | 13 +
 media-libs/xine-lib/xine-lib-1.2.8.ebuild   |  4 
 2 files changed, 17 insertions(+)

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
new file mode 100644
index 000..3406e32
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
@@ -0,0 +1,13 @@
+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.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 84c471c4b36..c2642d2f5c1 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -118,6 +118,10 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 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
 
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-03-04 Thread Alexis Ballier
commit: 9205464307f245204f4c156d9cb3927730898b66
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Mar  4 13:31:10 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Mar  4 13:36:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92054643

media-libs/xine-lib: Add := dep on libbluray

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-libs/xine-lib/xine-lib-1.2.8.ebuild| 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
index 8aac070e24c..84c471c4b36 100644
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${NLS_RDEPEND}
aac? ( media-libs/faad2 )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
-   bluray? ( >=media-libs/libbluray-0.2.1 )
+   bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 9a829b7d478..559e6402aa9 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -40,7 +40,7 @@ RDEPEND="${NLS_RDEPEND}
aac? ( media-libs/faad2 )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
-   bluray? ( >=media-libs/libbluray-0.2.1 )
+   bluray? ( >=media-libs/libbluray-0.2.1:= )
css? ( >=media-libs/libdvdcss-1.2.10 )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-02-28 Thread Lars Wendler
commit: 718efb76dd3405e52230e53e6b3f18354b198ed1
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 28 11:51:37 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 28 11:51:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718efb76

media-libs/xine-lib: Bump to version 1.2.8

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/xine-lib/Manifest  |   1 +
 media-libs/xine-lib/xine-lib-1.2.8.ebuild | 223 ++
 2 files changed, 224 insertions(+)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 715f47f04c..e9e9558edb 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1 +1,2 @@
 DIST xine-lib-1.2.6.tar.xz 5020964 SHA256 
bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 SHA512 
ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 WHIRLPOOL 
66d85e75e28598ce3790f08c69ccd912aac115c8071f1795abd51d43b1e35fbc08827ae93fc9ce113cc0c0565b409714103cfeb14aa7acefe6bdb2fdf46ee307
+DIST xine-lib-1.2.8.tar.xz 5151580 SHA256 
f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6 SHA512 
ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
 WHIRLPOOL 
eb4e5d6c44d3975036807ec59a3ce8d3bf3e38088e0604c67b862821d623401d869df576a963952257b3ff13d5ad5fb1431c546b9f2049fa48d5747c14d13235

diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
new file mode 100644
index 00..f6ce47e892
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool multilib eutils
+
+if [[ ${PV} == ** ]]; then
+   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
+   inherit mercurial eutils
+   unset NLS_IUSE
+   NLS_DEPEND="sys-devel/gettext"
+   NLS_RDEPEND="virtual/libintl"
+else
+   KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+   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 directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+   dev-libs/libxdg-basedir
+   media-libs/libdvdnav
+   sys-libs/zlib
+   !libav? ( media-video/ffmpeg:0= )
+   libav? (
+   media-libs/libpostproc:0=
+   media-video/libav:0=
+   )
+   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 )
+   directfb? ( dev-libs/DirectFB )
+   dts? ( media-libs/libdca )
+   dxr3? ( media-libs/libfame )
+   flac? ( media-libs/flac )
+   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
+   gtk? ( x11-libs/gdk-pixbuf:2 )
+   imagemagick? ( virtual/imagemagick-tools )
+   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+   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 )
+   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

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2017-02-11 Thread Pacho Ramos
commit: 6a3c1a4121fcbe04bbf4d45c62e23f3414e1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Feb 11 16:31:59 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Feb 11 16:32:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3c1a41

media-libs/xine-lib: FusionSound will disappear in the near future (#596534)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 4 ++--
 media-libs/xine-lib/xine-lib-1.2..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index e7c5b27916..0fc406626b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 
>=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 8fbeae0d09..b694f14f89 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 
>=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+   fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/

2017-01-04 Thread David Seifert
commit: 5a3ad9fcbeb0dce99007ae0a887190a59dc76fe9
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Dec 30 14:24:03 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  4 10:13:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3ad9fc

media-libs/xine-lib: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/3286

 media-libs/xine-lib/files/accel_vaapi.h | 135 
 1 file changed, 135 deletions(-)

diff --git a/media-libs/xine-lib/files/accel_vaapi.h 
b/media-libs/xine-lib/files/accel_vaapi.h
deleted file mode 100644
index 666b23f..
--- a/media-libs/xine-lib/files/accel_vaapi.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2008 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- * Common acceleration definitions for vdpau
- *
- *
- */
-
-#ifndef HAVE_XINE_ACCEL_VAAPI_H
-#define HAVE_XINE_ACCEL_VAAPI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include 
-#include 
-#ifdef HAVE_FFMPEG_AVUTIL_H
-#  include 
-#else
-#  include 
-#endif
-
-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && 
LIBAVCODEC_VERSION_MINOR >= 32)
-#  define AVVIDEO 2
-#else
-#  define AVVIDEO 1
-#  define pp_context   pp_context_t
-#  define pp_mode  pp_mode_t
-#endif
-
-#define NUM_OUTPUT_SURFACES 22
-
-#define SURFACE_FREE0
-#define SURFACE_ALOC1
-#define SURFACE_RELEASE 2
-#define SURFACE_RENDER  3
-#define SURFACE_RENDER_RELEASE  5
-
-struct vaapi_equalizer {
-  VADisplayAttribute brightness;
-  VADisplayAttribute contrast;
-  VADisplayAttribute hue;
-  VADisplayAttribute saturation;
-};
-
-typedef struct ff_vaapi_context_s ff_vaapi_context_t;
-
-struct ff_vaapi_context_s {
-  VADisplay va_display;
-  VAContextID   va_context_id;
-  VAConfigIDva_config_id;
-  int   width;
-  int   height;
-  int   sw_width;
-  int   sw_height;
-  int   va_profile;
-  unsigned int  va_colorspace;
-  VAImage   va_subpic_image;
-  VASubpictureIDva_subpic_id;
-  int   va_subpic_width;
-  int   va_subpic_height;
-  int   is_bound;
-  void  *gl_surface;
-  unsigned int  soft_head;
-  unsigned int  valid_context;
-  unsigned int  va_head;
-  unsigned int  va_soft_head;
-  vo_driver_t   *driver;
-  unsigned int  last_sub_image_fmt;
-  VASurfaceID   last_sub_surface_id;
-  struct vaapi_equalizer va_equalizer;
-  VAImageFormat *va_image_formats;
-  int   va_num_image_formats;
-  VAImageFormat *va_subpic_formats;
-  int   va_num_subpic_formats;
-};
-
-typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
-typedef struct vaapi_accel_s vaapi_accel_t;
-
-struct ff_vaapi_surface_s {
-  unsigned intindex;
-  vaapi_accel_t   *accel;
-  VASurfaceID va_surface_id;
-  unsigned intstatus;
-};
-
-struct vaapi_accel_s {
-  unsigned intindex;
-  vo_frame_t  *vo_frame;
-
-#if AVVIDEO > 1
-  int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, 
AVFrame *picture,
-   int *got_picture_ptr, AVPacket *avpkt);
-#else
-  int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, 
AVFrame *picture,
-  int *got_picture_ptr, uint8_t *buf, int 
buf_size);
-#endif
-  VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int 
height, int softrender);
-  int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, 
int codec_id, int vaapi_mpeg_sofdec);
-  ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
-  int (*guarded_render)(vo_frame_t *frame_gen);
-  ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
-  void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t 
*va_surface);
-  void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t 
*va_surface);
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-12-30 Thread Pacho Ramos
commit: e50e04a68aa88e56d04621e0954ad379022b24c3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Dec 30 12:06:53 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Dec 30 12:07:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50e04a6

media-libs/xine-lib: Needs to be rebuilt with libcdio subslot bumps

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 1acf133..e7c5b27 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -80,7 +80,7 @@ RDEPEND="${NLS_RDEPEND}
vaapi? ( x11-libs/libva )
vcd? (
>=media-video/vcdimager-0.7.23
-   dev-libs/libcdio[-minimal]
+   dev-libs/libcdio:0=[-minimal]
)
vdpau? ( x11-libs/libvdpau )
vorbis? (

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index eadba6e..8fbeae0 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -80,7 +80,7 @@ RDEPEND="${NLS_RDEPEND}
vaapi? ( x11-libs/libva )
vcd? (
>=media-video/vcdimager-0.7.23
-   dev-libs/libcdio[-minimal]
+   dev-libs/libcdio:0=[-minimal]
)
vdpau? ( x11-libs/libvdpau )
vorbis? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2016-11-27 Thread Mike Frysinger
commit: 42c946fd3b81136b633882884a8e47abc49c706e
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Nov 27 23:41:11 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Nov 27 23:43:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c946fd

media-libs/xine-lib: fix build w/newer glibc #580012

 media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch | 15 +++
 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild |  1 +
 2 files changed, 16 insertions(+)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
new file mode 100644
index ..a7168d5
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
@@ -0,0 +1,15 @@
+fix build w/newer glibc due to major/minor includes being dropped from 
sys/types.h
+
+https://bugs.gentoo.org/580012
+https://bugs.xine-project.org/show_bug.cgi?id=574
+
+--- a/src/xine-utils/xine_check.c
 b/src/xine-utils/xine_check.c
+@@ -55,6 +55,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 38f2b64..1acf133 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -118,6 +118,7 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 
 PATCHES=(
"${FILESDIR}/${P}-libxcb-1.12.patch"
+   "${FILESDIR}/${P}-sysmacros.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-11-27 Thread Pacho Ramos
commit: 39a6c7d9ea2d4f72bce64fc637526032b9bd83c4
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 27 19:26:37 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 27 20:03:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a6c7d9

media-libs/xine-lib: Allow usage of directfb fusionsound and use the same name 
for the USE as the other consumer in the tree and the one upstream uses too.

Package-Manager: portage-2.3.2

 media-libs/xine-lib/metadata.xml | 2 +-
 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 6 +++---
 media-libs/xine-lib/xine-lib-1.2..ebuild | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 057fb63..9d10869 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -18,7 +18,7 @@
container (OggFLAC), but might have better support for 
exotic features like
24-bit samples or 96kHz sample rates.

-   
+   
Enable support for the Fusion audio sub system



diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 82c7e05..38f2b64 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusion gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusion? ( media-libs/FusionSound )
+   fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 
>=dev-libs/DirectFB-1.7.1[fusionsound] ) )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -191,7 +191,7 @@ src_configure() {
$(use_with X x) \
$(use_with alsa) \
--without-esound \
-   $(use_with fusion fusionsound) \
+   $(use_with fusionsound) \
$(use_with jack) \
$(use_with pulseaudio) \
$(use_with libcaca caca) \

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 415fe0a..eadba6e 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusion gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac 
fusionsound gtk imagemagick ipv6 jack jpeg libav 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 +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
dev-libs/libxdg-basedir
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
dts? ( media-libs/libdca )
dxr3? ( media-libs/libfame )
flac? ( media-libs/flac )
-   fusion? ( media-libs/FusionSound )
+   fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 
>=dev-libs/DirectFB-1.7.1[fusionsound] ) )
gtk? ( x11-libs/gdk-pixbuf:2 )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -191,7 +191,7 @@ src_configure() {
$(use_with X x) \
$(use_with alsa) \
--without-esound \
-   $(use_with fusion fusionsound) \
+   $(use_with fusionsound) \
$(use_with jack) \
$(use_with pulseaudio) \
$(use_with libcaca caca) \



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-08-11 Thread Lars Wendler
commit: 51e57c9a57c755dd209b784e6bd75a9bfca22260
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Aug 11 19:19:22 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Aug 11 19:19:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e57c9a

media-libs/xine-lib: Added sub-slot dep for media-libs/libvpx.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 18a0be4..82c7e05 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${NLS_RDEPEND}
media-libs/libogg
media-libs/libvorbis
)
-   vpx? ( media-libs/libvpx )
+   vpx? ( media-libs/libvpx:0= )
wavpack? ( media-sound/wavpack )
X? (
x11-libs/libX11

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index dc6926a..415fe0a 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -87,7 +87,7 @@ RDEPEND="${NLS_RDEPEND}
media-libs/libogg
media-libs/libvorbis
)
-   vpx? ( media-libs/libvpx )
+   vpx? ( media-libs/libvpx:0= )
wavpack? ( media-sound/wavpack )
X? (
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-07-22 Thread Lars Wendler
commit: a133872bac37de8c89ebe82ee0edb44be7229b71
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 22 08:37:58 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 22 08:52:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a133872b

media-libs/xine-lib: Removed old.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/xine-lib/Manifest  |   1 -
 media-libs/xine-lib/xine-lib-1.2.3.ebuild | 214 
 media-libs/xine-lib/xine-lib-1.2.6.ebuild | 223 --
 3 files changed, 438 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index dbd68dc..715f47f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,2 +1 @@
-DIST xine-lib-1.2.3.tar.xz 4905356 SHA256 
e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a SHA512 
1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887
 WHIRLPOOL 
0e6bfb61ce77d14fbd0a807499b2a0b3f04ac976e8b7c06a5b34be06cbecb822339451031b80c4dc8faa5265adb1883861d96d0e7dc43a0b3ebe7040b619fb65
 DIST xine-lib-1.2.6.tar.xz 5020964 SHA256 
bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 SHA512 
ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 WHIRLPOOL 
66d85e75e28598ce3790f08c69ccd912aac115c8071f1795abd51d43b1e35fbc08827ae93fc9ce113cc0c0565b409714103cfeb14aa7acefe6bdb2fdf46ee307

diff --git a/media-libs/xine-lib/xine-lib-1.2.3.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.3.ebuild
deleted file mode 100644
index 4a0645f..000
--- a/media-libs/xine-lib/xine-lib-1.2.3.ebuild
+++ /dev/null
@@ -1,214 +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 libtool multilib
-
-if [[ ${PV} == ** ]]; then
-   EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
-   inherit autotools mercurial eutils
-   unset NLS_IUSE
-   NLS_DEPEND="sys-devel/gettext"
-   NLS_RDEPEND="virtual/libintl"
-else
-   KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-   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 directfb dts dvb dxr3 fbcon flac 
fusion 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 wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-   dev-libs/libxdg-basedir
-   media-libs/libdvdnav
-   sys-libs/zlib
-   || ( media-video/ffmpeg:0 media-libs/libpostproc 
=media-libs/libbluray-0.2.1 )
-   css? ( >=media-libs/libdvdcss-1.2.10 )
-   directfb? ( dev-libs/DirectFB )
-   dts? ( media-libs/libdca )
-   dxr3? ( media-libs/libfame )
-   flac? ( media-libs/flac )
-   fusion? ( media-libs/FusionSound )
-   gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-   jpeg? ( virtual/jpeg )
-   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? ( =media-video/vcdimager-0.7.23
-   dev-libs/libcdio[-minimal]
-   )
-   vdpau? ( x11-libs/libvdpau )
-   vorbis? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   wavpack? ( media-sound/wavpack )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXext
-   )
-   xcb? ( x11-libs/libxcb )
-   xinerama? ( x11-libs/libXinerama )
-   xv? ( x11-libs/libXv )
-   xvmc? ( x11-libs/libXvMC )"
-DEPEND="${RDEPEND}
-   ${NLS_DEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   >=sys-devel/libtool-2.2.6b
-   oss? ( virtual/os-headers )
-   v4l? ( virtual/os-headers )
-   X? (
-   x11-libs/libXt
-   x11-proto/xf86vidmodeproto
-   x11-proto/xproto
-   )
-   xv? ( x11-proto/videoproto )
-   xvmc? ( x11-proto/videoproto )
-   xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="vidix? ( || ( X fbcon ) )
-   xv? ( X )
-   

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2016-07-22 Thread Lars Wendler
commit: 945b213eb8d07eaf5d1a4d359ab2b13378354f9d
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 22 08:37:11 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 22 08:52:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945b213e

media-libs/xine-lib: Fixed compilation with >=x11-libs/libxcb-1.12

Gentoo bug #584640

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/xine-lib-1.2.6-libxcb-1.12.patch | 25 ++
 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild   | 17 +++
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch 
b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
new file mode 100644
index 000..cc17643
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
@@ -0,0 +1,25 @@
+https://bugs.xine-project.org/show_bug.cgi?id=572
+https://bugs.gentoo.org/584640
+
+--- xine-lib-1.2.6/m4/video_out.m4
 xine-lib-1.2.6/m4/video_out.m4
+@@ -305,7 +305,7 @@
+ dnl xcb
+ XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
+ if test x"$with_xcb" != x"no"; then
+-PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], 
[have_xcb=no])
++PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], 
[have_xcb=no])
+ if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; 
then
+ AC_MSG_ERROR([XCB support requested, but XCB not found])
+ elif test x"$have_xcb" = x"yes"; then
+--- xine-lib-1.2.6/src/video_out/Makefile.am
 xine-lib-1.2.6/src/video_out/Makefile.am
+@@ -147,7 +147,7 @@
+ xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) 
$(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
+ 
+ xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
+-xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) 
$(XCBXV_LIBS) $(XCB_LIBS)
++xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) 
$(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
+ xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
+ 
+ xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 032fd3c..18a0be4 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=6
 
-inherit flag-o-matic libtool multilib eutils
+inherit autotools flag-o-matic libtool multilib eutils
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
-   inherit autotools mercurial eutils
+   inherit mercurial eutils
unset NLS_IUSE
NLS_DEPEND="sys-devel/gettext"
NLS_RDEPEND="virtual/libintl"
@@ -116,23 +116,22 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
xv? ( X )
xinerama? ( X )"
 
+PATCHES=(
+   "${FILESDIR}/${P}-libxcb-1.12.patch"
+)
+
 src_prepare() {
default
 
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' 
src/vdr/input_vdr.c || die
+   has_version '>=media-video/ffmpeg-2.9' && eapply 
"${FILESDIR}/ffmpeg29.patch"
 
-   if [[ ${PV} == ** ]]; then
-   epatch_user
-   eautoreconf
-   else
-   elibtoolize
-   fi
+   eautoreconf
 
local x
for x in 0 1 2 3; do
sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
done
-   has_version '>=media-video/ffmpeg-2.9' && eapply 
"${FILESDIR}/ffmpeg29.patch"
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-06-21 Thread Michał Górny
commit: a1493acc4ec62d79348449837e3d0a3aff3f97a6
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun 21 19:42:24 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jun 21 19:42:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1493acc

media-libs/xine-lib: Remove := slot op from ||, #586316

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 2 +-
 media-libs/xine-lib/xine-lib-1.2..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 0d16682..032fd3c 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
flac? ( media-libs/flac )
fusion? ( media-libs/FusionSound )
gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
libcaca? ( media-libs/libcaca )

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index 79fdaae..dc6926a 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
flac? ( media-libs/flac )
fusion? ( media-libs/FusionSound )
gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
libcaca? ( media-libs/libcaca )



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

2016-05-02 Thread Lars Wendler
commit: e03d4f7e0da37d663654b26e386652c3d96e27cc
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  2 07:49:06 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  2 07:51:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03d4f7e

media-libs/xine-lib: Added slotdep for imagemagick. Bumped to EAPI-6.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 10 ++
 media-libs/xine-lib/xine-lib-1.2..ebuild |  8 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 543d87f..0d16682 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit flag-o-matic libtool multilib eutils
 
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
flac? ( media-libs/flac )
fusion? ( media-libs/FusionSound )
gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+   imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
libcaca? ( media-libs/libcaca )
@@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
xinerama? ( X )"
 
 src_prepare() {
+   default
+
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' 
src/vdr/input_vdr.c || die
 
if [[ ${PV} == ** ]]; then
@@ -130,7 +132,7 @@ src_prepare() {
for x in 0 1 2 3; do
sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
done
-   has_version '>=media-video/ffmpeg-2.9' && epatch 
"${FILESDIR}/ffmpeg29.patch"
+   has_version '>=media-video/ffmpeg-2.9' && eapply 
"${FILESDIR}/ffmpeg29.patch"
 }
 
 src_configure() {

diff --git a/media-libs/xine-lib/xine-lib-1.2..ebuild 
b/media-libs/xine-lib/xine-lib-1.2..ebuild
index eb4ee3b..79fdaae 100644
--- a/media-libs/xine-lib/xine-lib-1.2..ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2..ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit flag-o-matic libtool multilib
 
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
flac? ( media-libs/flac )
fusion? ( media-libs/FusionSound )
gtk? ( x11-libs/gdk-pixbuf:2 )
-   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+   imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
jpeg? ( virtual/jpeg:0 )
libcaca? ( media-libs/libcaca )
@@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
xinerama? ( X )"
 
 src_prepare() {
+   default
+
sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' 
src/vdr/input_vdr.c || die
 
if [[ ${PV} == ** ]]; then



[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/, media-libs/xine-lib/files/

2015-09-15 Thread Alexis Ballier
commit: a59351a243cc55ff56ab15895b16356846cbe0ca
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Sep 15 12:15:39 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Sep 15 12:15:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a59351a2

media-libs/xine-lib: fix build with ffmpeg git master

Package-Manager: portage-2.2.20.1

 media-libs/xine-lib/files/ffmpeg29.patch | 44 
 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/media-libs/xine-lib/files/ffmpeg29.patch 
b/media-libs/xine-lib/files/ffmpeg29.patch
new file mode 100644
index 000..a220483
--- /dev/null
+++ b/media-libs/xine-lib/files/ffmpeg29.patch
@@ -0,0 +1,44 @@
+Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
+===
+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
 xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
+@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
+   int got_frame;
+   float gain = this->class->gain;
+   if (!this->av_frame)
+-this->av_frame = avcodec_alloc_frame ();
++this->av_frame = av_frame_alloc ();
+ 
+   consumed = avcodec_decode_audio4 (this->context, this->av_frame, 
_frame, );
+   if ((consumed >= 0) && got_frame) {
+@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
+   /* try to reset the wma decoder */
+   if( this->decoder_ok ) {
+ #if AVAUDIO > 3
+-avcodec_free_frame (>av_frame);
++av_frame_free (>av_frame);
+ #endif
+ pthread_mutex_lock (_lock);
+ avcodec_close (this->context);
+@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
+ 
+   if( this->context && this->decoder_ok ) {
+ #if AVAUDIO > 3
+-avcodec_free_frame (>av_frame);
++av_frame_free (>av_frame);
+ #endif
+ pthread_mutex_lock (_lock);
+ avcodec_close (this->context);
+Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
+===
+--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
 xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
+@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
+   this->stream= stream;
+   this->class = (ff_video_class_t *) class_gen;
+ 
+-  this->av_frame  = avcodec_alloc_frame();
++  this->av_frame  = av_frame_alloc();
+   this->context   = avcodec_alloc_context();
+   this->context->opaque   = this;
+ #if AVPALETTE == 1

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild 
b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index ac9f0f4..543d87f 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic libtool multilib
+inherit flag-o-matic libtool multilib eutils
 
 if [[ ${PV} == ** ]]; then
EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2;
@@ -130,6 +130,7 @@ src_prepare() {
for x in 0 1 2 3; do
sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
done
+   has_version '>=media-video/ffmpeg-2.9' && epatch 
"${FILESDIR}/ffmpeg29.patch"
 }
 
 src_configure() {