subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-video\/gpac\/"

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-09-29 Thread Sam James

commit: 9814c939ebdcf12eeb186be0742ef18abab7f197
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 29 10:25:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 29 10:31:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9814c939

media-video/gpac: drop patch for newer zlib

See 491bf8bd3ef621da49b168736a04f23aa4c7719c. Could do ifndef in patch
but I'd like to remove all of these eventually and there's only a handful.

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

 media-video/gpac/gpac-2.0.0.ebuild| 6 --
 media-video/gpac/gpac-2.2.0.ebuild| 8 +++-
 media-video/gpac/gpac-2.2.1-r1.ebuild | 8 +++-
 media-video/gpac/gpac-.ebuild | 8 +++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index 34e01f0cc807..884c45073b43 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.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=7
@@ -64,7 +64,6 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-2.0.0-configure.patch"
-   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
 DOCS=(
@@ -91,6 +90,9 @@ my_use() {
 src_prepare() {
default
sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+
+   # TODO: remove when old zlib is no longer in tree
+   has_version "

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-06-10 Thread Andreas Sturmlechner

commit: 793c0b5345e1ec4431a5afccb0befb3b11a31414
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 18:13:36 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 18:14:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793c0b53

media-video/gpac: Switch IUSE=pulseaudio to media-libs/libpulse

This had already been done for  but looks like it is not used
as template for new version bumps.

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

 media-video/gpac/{gpac-2.2.1.ebuild => gpac-2.2.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.2.1.ebuild 
b/media-video/gpac/gpac-2.2.1-r1.ebuild
similarity index 98%
rename from media-video/gpac/gpac-2.2.1.ebuild
rename to media-video/gpac/gpac-2.2.1-r1.ebuild
index d6a91321cd56..fc002d795023 100644
--- a/media-video/gpac/gpac-2.2.1.ebuild
+++ b/media-video/gpac/gpac-2.2.1-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
virtual/opengl
)
png? ( media-libs/libpng:0= )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
theora? ( media-libs/libtheora )
truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-06-05 Thread Alexis Ballier

commit: 1ce349d7b39e1220f0575be2a2616ffd7efb34a1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun  5 08:01:05 2023 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun  5 08:01:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce349d7

media-video/gpac: bump to 2.2.1

Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/gpac/Manifest  |   1 +
 media-video/gpac/gpac-2.2.1.ebuild | 146 +
 2 files changed, 147 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 5b4301b8344a..59e0c115eaf8 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,3 @@
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B 
a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086
 SHA512 
e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
 DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B 
f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089
 SHA512 
4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
+DIST gpac-2.2.1.tar.gz 11377184 BLAKE2B 
44b47459da0f203d0e4c0eed5836a59f44fb508db4e601b46e9ffdb53d89bb49e22ccdfe7951b17581130f186c47ae8efc0d9002685d5cf9a3547159356d2d9e
 SHA512 
873df4c2fdc3594a0f3bce66d511cee14669643042ab1ca8d7f370ad3f50636c32c31f79818051d00bf844de30a5533ae30c81ed168baf2626a152771b6a6845

diff --git a/media-video/gpac/gpac-2.2.1.ebuild 
b/media-video/gpac/gpac-2.2.1.ebuild
new file mode 100644
index ..d6a91321cd56
--- /dev/null
+++ b/media-video/gpac/gpac-2.2.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == * ]] ; then
+   SCM="git-r3"
+   EGIT_REPO_URI="https://github.com/gpac/gpac;
+else
+   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit toolchain-funcs ${SCM} xdg
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/;
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/11"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k mad 
opengl oss png
+   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+   media-libs/libogg
+   sys-libs/zlib
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( media-video/ffmpeg:0= )
+   jack? ( virtual/jack )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
+   jpeg2k? ( media-libs/openjpeg:2 )
+   mad? ( media-libs/libmad )
+   opengl? (
+   media-libs/freeglut
+   virtual/glu
+   virtual/opengl
+   )
+   png? ( media-libs/libpng:0= )
+   pulseaudio? ( media-sound/pulseaudio )
+   theora? ( media-libs/libtheora )
+   truetype? ( media-libs/freetype:2 )
+   sdl? ( media-libs/libsdl )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   vorbis? ( media-libs/libvorbis )
+   X? (
+   x11-libs/libXt
+   x11-libs/libX11
+   x11-libs/libXv
+   x11-libs/libXext
+   )
+   xml? ( dev-libs/libxml2:2= )
+   xvid? ( media-libs/xvid )
+"
+DEPEND="
+   ${RDEPEND}
+   dvb? ( sys-kernel/linux-headers )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.0-configure.patch"
+   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+   "${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
+   "${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
+)
+
+DOCS=(
+   share/doc/CODING_STYLE
+   share/doc/GPAC\ UPnP.doc
+   share/doc/ISO\ 639-2\ codes.txt
+   share/doc/SceneGenerators
+   share/doc/ipmpx_syntax.bt
+   Changelog
+   README.md
+)
+
+my_use() {
+   local flag="$1" pflag="${2:-$1}"
+   if use ${flag}; then
+   echo "--use-${pflag}=system"
+   else
+   echo "--use-${pflag}=no"
+   fi
+}
+
+src_configure() {
+   tc-export CC CXX AR RANLIB
+
+   local myeconfargs=(
+   --cc="$(tc-getCC)"
+   --libdir="$(get_libdir)"
+   --verbose
+   --enable-pic
+   --enable-svg
+   --use-ogg=system
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable dvb dvb4linux)
+   $(use_enable jack jack yes)
+   $(use_enable opengl 3d)
+   $(use_enable oss oss-audio)
+   $(use_enable pulseaudio pulseaudio yes)
+

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-06-01 Thread Sam James

commit: 1600826b137f6429eb2b17f967ae16de1a0f1be3
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 06:21:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 06:21:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1600826b

media-video/gpac: Stabilize 2.2.0 ppc64, #907576

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

 media-video/gpac/gpac-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.2.0.ebuild 
b/media-video/gpac/gpac-2.2.0.ebuild
index 8cb2e167094e..3c3e56e2a419 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc ~x86"
 fi
 
 inherit toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-05-31 Thread Sam James

commit: 5f4d0e6f846d8e675b1e78d616b29e27838179a4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:36:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:36:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4d0e6f

media-video/gpac: Stabilize 2.2.0 amd64, #907576

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

 media-video/gpac/gpac-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.2.0.ebuild 
b/media-video/gpac/gpac-2.2.0.ebuild
index d6a91321cd56..8cb2e167094e 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2023-05-29 Thread Andreas Sturmlechner

commit: 1628e847f660f91b759002024399daaa252cca38
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:46:17 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 13:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1628e847

media-video/gpac: Switch IUSE=pulseaudio to media-libs/libpulse

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

 media-video/gpac/gpac-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index d8ee67521cd8..f21d8e2a08aa 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
virtual/opengl
)
png? ( media-libs/libpng:0= )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
theora? ( media-libs/libtheora )
truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2023-04-10 Thread Sam James

commit: b489b1a671b51c3def4b4cdfdd419155caad4b73
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 09:24:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 09:24:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b489b1a6

media-video/gpac: fix build w/ >=ffmpeg-5

Closes: https://bugs.gentoo.org/903550
Thanks-to: Andrew Udvare  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../gpac/files/gpac-2.2.0-ffmpeg6-deux.patch   | 46 ++
 media-video/gpac/gpac-2.2.0.ebuild |  1 +
 2 files changed, 47 insertions(+)

diff --git a/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch 
b/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch
new file mode 100644
index ..695852847395
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/903550
+
+From ba14e34dd7a3c4cef5a56962898e9f863dd4b4f3 Mon Sep 17 00:00:00 2001
+From: jeanlf 
+Date: Mon, 13 Mar 2023 09:43:52 +0100
+Subject: [PATCH] fixed compil with ffmpeg 6 - cf #2406
+
+--- a/src/filters/ff_mx.c
 b/src/filters/ff_mx.c
+@@ -503,7 +503,11 @@ static GF_Err ffmx_close_seg(GF_Filter *filter, 
GF_FFMuxCtx *ctx, Bool send_evt_
+   evt.seg_size.is_init = 0;
+   }
+   evt.seg_size.media_range_start = ctx->offset_at_seg_start;
++#if LIBAVFORMAT_VERSION_MAJOR >= 60
+   evt.seg_size.media_range_end = ctx->muxer->pb ? 
(ctx->muxer->pb->bytes_written-1) : 0;
++#else
++  evt.seg_size.media_range_end = ctx->muxer->pb ? 
(ctx->muxer->pb->written-1) : 0;
++#endif
+   ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+
+   gf_filter_pid_send_event(pid, );
+@@ -1013,13 +1017,21 @@ static GF_Err ffmx_configure_pid(GF_Filter *filter, 
GF_FilterPid *pid, Bool is_r
+   ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, _codec_tag);
+   }
+
++
++  res = 1;
++#if LIBAVFORMAT_VERSION_MAJOR < 60
+   if (ctx->muxer->oformat) {
+   res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, 1);
+-  if (!res) {
+-  GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec 
%s not supported in container %s\n", gf_codecid_name(codec_id), 
ctx->muxer->oformat->name));
+-  return GF_NOT_SUPPORTED;
+-  }
+   }
++#else
++  res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, 
FF_COMPLIANCE_NORMAL);
++#endif
++
++  if (!res) {
++  GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not 
supported in container %s\n", gf_codecid_name(codec_id), 
ctx->muxer->oformat->name));
++  return GF_NOT_SUPPORTED;
++  }
++
+   const AVCodec *c = avcodec_find_decoder(ff_codec_id);
+   if (!c) return GF_NOT_SUPPORTED;

diff --git a/media-video/gpac/gpac-2.2.0.ebuild 
b/media-video/gpac/gpac-2.2.0.ebuild
index d8ee67521cd8..d6a91321cd56 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
+   "${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
 )
 
 DOCS=(

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2023-03-29 Thread Alexis Ballier

commit: 909822b6b67aed377cfcc99407e52eb7e3aa9565
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Mar 29 15:57:15 2023 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Mar 29 16:16:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909822b6

media-video/gpac: bump to 2.2.0

Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/gpac/Manifest  |   1 +
 media-video/gpac/files/gpac-2.2.0-configure.patch  | 104 +
 media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch|  24 +
 .../gpac/{gpac-.ebuild => gpac-2.2.0.ebuild}   |  19 +---
 media-video/gpac/gpac-.ebuild  |  19 +---
 5 files changed, 139 insertions(+), 28 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 1eeffa596c2a..5b4301b8344a 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B 
a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086
 SHA512 
e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
+DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B 
f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089
 SHA512 
4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2

diff --git a/media-video/gpac/files/gpac-2.2.0-configure.patch 
b/media-video/gpac/files/gpac-2.2.0-configure.patch
new file mode 100644
index ..1d26b52a6d90
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-configure.patch
@@ -0,0 +1,104 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+
+Index: gpac-2.2.0/Makefile
+===
+--- gpac-2.2.0.orig/Makefile
 gpac-2.2.0/Makefile
+@@ -276,7 +276,9 @@ install-lib:
+   $(INSTALL) $(INSTFLAGS) -m 644 config.h 
"$(DESTDIR)$(prefix)/include/gpac/configuration.h" || true
+ 
+   $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(lib_dir)" || true
++endif
+ 
+   $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+Index: gpac-2.2.0/configure
+===
+--- gpac-2.2.0.orig/configure
 gpac-2.2.0/configure
+@@ -74,6 +74,7 @@ enable_sanitizer="no"
+ libgpac_cflags=""
+ libgpac_extralibs=""
+ static_build="no"
++static_libs="no"
+ static_bin="no"
+ static_modules="no"
+ lm_lib=""
+@@ -273,6 +274,7 @@ GPAC build options:
+   --disable-optdisable GCC optimizations
+   --static-build   link statically against libgpac but still allow 
dependencies to shared libraries (enable --static-modules)
+   --static-bin enable static linking of MP4Box and gpac only 
(will enable --static-build), disable all libraries not linkable statically.
++  --enable-static-lib  GPAC static libraries build
+   --sdl-cfg=SDL_PATH   specify path to sdl-config for local install 
[$sdl_path]
+   --enable-sdl-static  use static SDL linking [default=no]
+   --X11-path=X11_PATH  specify path for X11 includes and libraries 
[$X11_PATH]
+@@ -552,6 +554,8 @@ for opt do
+ echo "$opt deprecated, use --static-build instead"
+ static_build="yes";
+ ;;
++--enable-static-libs) static_libs="yes";
++;;
+ --enable-fixed-point) use_fixed_point="yes"
+ ;;
+ --strip) INSTFLAGS="-s $INSTFLAGS"
+@@ -943,14 +947,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-CFLAGS="-O3 $CFLAGS"
+-else
+-CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -978,11 +974,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+-
+ #check dlopen support
+ has_dlopen="no"
+ cat > $TMPC << EOF
+@@ -1888,6 +1879,7 @@ else
+ fi
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -2604,6 +2596,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> config.mak
+ echo "STATIC_BUILD=$static_build" >> config.mak
++echo "STATIC_LIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/

2022-11-15 Thread Conrad Kostecki

commit: 79920e7ac5dbecd1c6b9001e4266bd027a7aaf8f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Nov 14 17:49:23 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Nov 15 22:43:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79920e7a

media-video/gpac: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/gpac/files/gpac-1.0.1-configure.patch | 117 --
 1 file changed, 117 deletions(-)

diff --git a/media-video/gpac/files/gpac-1.0.1-configure.patch 
b/media-video/gpac/files/gpac-1.0.1-configure.patch
deleted file mode 100644
index e471157af6b6..
--- a/media-video/gpac/files/gpac-1.0.1-configure.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-* Makes static libs optional
-* Removes auto-SSE2 detection
-
-diff --git a/Makefile b/Makefile
-index 303a413..1ef750e 100644
 a/Makefile
-+++ b/Makefile
-@@ -284,8 +284,9 @@ ifeq ($(GPAC_ENST),yes)
- endif
- 
-   $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
-+ifeq ($(STATIC_LIBS), yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(lib_dir)" || true
--
-+endif
-   $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
-   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
- 
-diff --git a/configure b/configure
-index de8ea99..4f5a6a8 100755
 a/configure
-+++ b/configure
-@@ -105,6 +105,7 @@ has_dvb4linux="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -264,6 +265,7 @@ GPAC configuration options:
-   --enable-amr-wb  enable AMR WB library
-   --enable-amr enable both AMR NB and WB libraries
-   --enable-static-bin  link statically against libgpac
-+  --enable-static-lib  GPAC static libraries build
-   --static-mp4box  configure for static linking of MP4Box only.
-   --enable-depth   enables depth handling in the compositor
- 
-@@ -706,14 +708,6 @@ if docc -lz -Wno-pointer-sign ; then
- fi
- 
- 
--#GCC opt
--if test "$no_gcc_opt" = "no"; then
--CFLAGS="-O3 $CFLAGS"
--else
--CFLAGS="-O0 $CFLAGS"
--fi
--
--
- #GCC PIC
- if test "$cross_prefix" != "" ; then
- want_pic="no"
-@@ -1710,6 +1704,8 @@ for opt do
- ;;
- --enable-static-bin) static_build="yes";
- ;;
-+--enable-static-libs) static_libs="yes";
-+;;
- --disable-ipv6) has_ipv6="no"
- ;;
- --disable-platinum) has_platinum="no"
-@@ -2357,6 +2353,7 @@ echo "** GPAC $version rev$revision Core Configuration 
**"
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Sanitizer enabled: $enable_sanitizer"
- echo "Fixed-Point Version: $use_fixed_point"
-@@ -3049,6 +3046,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-diff --git a/src/Makefile b/src/Makefile
-index c483c8d..b24d5bb 100644
 a/src/Makefile
-+++ b/src/Makefile
-@@ -347,7 +347,6 @@ filters_svc: $(LIBGPAC_FILTERS_SVC)
-   @echo "LIBS $(EXTRALIBS)"
- 
- ifeq ($(CONFIG_DARWIN),yes)
--
-   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
-   $(RANLIB) ../bin/gcc/libgpac_static.a
- ifneq ($(STATICBUILD),yes)
-@@ -355,9 +354,10 @@ ifneq ($(STATICBUILD),yes)
- endif
- 
- else
--
-+ifeq ($(STATICLIBS), yes)
-   $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
-   $(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
-   $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) 
$(LDFLAGS)
-   mv $@ $@.$(VERSION_SONAME)
-diff --git a/configure b/configure
-index 4f5a6a8..baba248 100755
 a/configure
-+++ b/configure
-@@ -735,10 +735,6 @@ cat > $TMPC << EOF
- int main( void ) { return 0; }
- EOF
- 
--if docc -msse2 $LDFLAGS ; then
--  CFLAGS="$CFLAGS -msse2"
--fi
--
- 
- #look for zlib
- cat > $TMPC << EOF

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-11-12 Thread Matt Turner

commit: 08c0601f98326d3f222b36dd68b3101dafe124be
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:44:15 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:44:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c0601f

media-video/gpac: Switch to media-libs/libjpeg-turbo

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

 media-video/gpac/gpac-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 3dfa49013baf..777f20e6208b 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
jpeg2k? ( media-libs/openjpeg:2 )
mad? ( media-libs/libmad )
opengl? (

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-11-12 Thread Matt Turner

commit: 9b5ffed26d22df9fd19801b0f1ee81e0c409d5e5
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:43:32 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:43:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5ffed2

media-video/gpac: Drop IUSE=ipv6

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

 media-video/gpac/gpac-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 6082d6bf02c5..3dfa49013baf 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/11"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k mad 
opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -100,6 +100,7 @@ src_configure() {
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose
+   --enable-ipv6
--enable-pic
--enable-svg
--disable-amr
@@ -108,7 +109,6 @@ src_configure() {
$(use_enable alsa)
$(use_enable debug)
$(use_enable dvb dvb4linux)
-   $(use_enable ipv6)
$(use_enable jack jack yes)
$(use_enable opengl 3d)
$(use_enable oss oss-audio)

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-11-12 Thread Matt Turner

commit: 7945e47ce5aa896147f882738de65d43784b91b0
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:37:45 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:37:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7945e47c

media-video/gpac: Drop unused inherits

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 media-video/gpac/gpac-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index 3a6ccfbdc055..34e01f0cc807 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
+inherit toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/;

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 1c87f44bd3fe..6082d6bf02c5 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
+inherit toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/;

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-11-12 Thread Matt Turner

commit: 34727a187d85745de1ba11622427e9b8a3df21bf
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:29:30 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:32:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34727a18

media-video/gpac: Drop old versions

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

 media-video/gpac/Manifest  |   1 -
 media-video/gpac/gpac-1.0.1.ebuild | 154 -
 2 files changed, 155 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 84cbbe3a0255..1eeffa596c2a 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 
80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db
 SHA512 
533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B 
a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086
 SHA512 
e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
deleted file mode 100644
index 65ed5f65e282..
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == * ]] ; then
-   SCM="git-r3"
-   EGIT_REPO_URI="https://github.com/gpac/gpac;
-else
-   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/;
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
mad opengl oss png
-   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-   media-libs/libogg
-   sys-libs/zlib
-   a52? ( media-libs/a52dec )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( media-video/ffmpeg:0= )
-   jack? ( virtual/jack )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:2 )
-   mad? ( media-libs/libmad )
-   opengl? (
-   media-libs/freeglut
-   virtual/glu
-   virtual/opengl
-   )
-   png? ( media-libs/libpng:0= )
-   pulseaudio? ( media-sound/pulseaudio )
-   theora? ( media-libs/libtheora )
-   truetype? ( media-libs/freetype:2 )
-   sdl? ( media-libs/libsdl )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   vorbis? ( media-libs/libvorbis )
-   X? (
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext
-   )
-   xml? ( dev-libs/libxml2:2= )
-   xvid? ( media-libs/xvid )
-"
-DEPEND="
-   ${RDEPEND}
-   dvb? ( sys-kernel/linux-headers )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.0.1-configure.patch"
-   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
-)
-
-DOCS=(
-   share/doc/CODING_STYLE
-   share/doc/GPAC\ UPnP.doc
-   share/doc/ISO\ 639-2\ codes.txt
-   share/doc/SceneGenerators
-   share/doc/ipmpx_syntax.bt
-   Changelog
-   README.md
-)
-
-HTML_DOCS="share/doc/*.html"
-
-my_use() {
-   local flag="$1" pflag="${2:-$1}"
-   if use ${flag}; then
-   echo "--use-${pflag}=system"
-   else
-   echo "--use-${pflag}=no"
-   fi
-}
-
-src_prepare() {
-   default
-   sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-   tc-export CC CXX AR RANLIB
-
-   local myeconfargs=(
-   --cc="$(tc-getCC)"
-   --libdir="$(get_libdir)"
-   --verbose
-   --enable-pic
-   --enable-svg
-   --disable-amr
-   --use-js=no
-   --use-ogg=system
-   $(use_enable alsa)
-   $(use_enable debug)
-   $(use_enable dvb dvb4linux)
-   $(use_enable ipv6)
-   $(use_enable jack jack yes)
-   $(use_enable opengl 3d)
-   $(use_enable oss oss-audio)
-   $(use_enable pulseaudio pulseaudio yes)
-   $(use_enable sdl)
-   $(use_enable ssl)
-   $(use_enable static-libs static-lib)
-   $(use_enable X x11)
-   $(use_enable X x11-shm)
-

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-04-10 Thread Arthur Zamarin

commit: c91cf97e3dcdb0c3a5a7e87d16c52b690e14e9f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 10 17:37:48 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 10 17:37:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91cf97e

media-video/gpac: Stabilize 2.0.0 ppc64, #836960

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index ded0f12ab748..3a6ccfbdc055 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-04-10 Thread Arthur Zamarin

commit: 47052f0ef5f6bd4b87d245a146a75772c5d5cd38
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 10 17:37:47 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 10 17:37:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47052f0e

media-video/gpac: Stabilize 2.0.0 sparc, #836960

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index c941cbe85032..ded0f12ab748 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-04-09 Thread Arthur Zamarin

commit: 0ea11206ce0e91383610d5581621095dd3f6a85c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  9 19:49:39 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  9 19:49:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea11206

media-video/gpac: Stabilize 2.0.0 ppc, #836960

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index 2d84c8334838..c941cbe85032 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-04-07 Thread Jakov Smolić

commit: 0fcbd7fa94e2be885215c93f454db4d20c668c9f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Apr  7 20:55:59 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Apr  7 20:57:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcbd7fa

media-video/gpac: Stabilize 2.0.0 x86, #836960

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index a50eaabb6afd..2d84c8334838 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2022-04-07 Thread Jakov Smolić

commit: ff25924488343894f421d0daaed95075ec1a3e2f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Apr  7 20:55:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Apr  7 20:57:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff259244

media-video/gpac: Stabilize 2.0.0 amd64, #836960

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

 media-video/gpac/gpac-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-2.0.0.ebuild 
b/media-video/gpac/gpac-2.0.0.ebuild
index 1c87f44bd3fe..a50eaabb6afd 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2022-02-25 Thread Alexis Ballier

commit: 1eebad3a210f378c87a67b32d2963c44ee5bb208
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Feb 25 09:46:05 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Feb 25 09:46:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eebad3a

media-video/gpac: bump to 2.0.0

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

 media-video/gpac/Manifest  |   1 +
 media-video/gpac/files/gpac-2.0.0-configure.patch  | 113 +
 .../gpac/{gpac-.ebuild => gpac-2.0.0.ebuild}   |   6 +-
 media-video/gpac/gpac-.ebuild  |   6 +-
 4 files changed, 120 insertions(+), 6 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3119d5d920e5..84cbbe3a0255 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
 DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 
80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db
 SHA512 
533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
+DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B 
a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086
 SHA512 
e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f

diff --git a/media-video/gpac/files/gpac-2.0.0-configure.patch 
b/media-video/gpac/files/gpac-2.0.0-configure.patch
new file mode 100644
index ..2b54d16a8d22
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.0.0-configure.patch
@@ -0,0 +1,113 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+
+Index: gpac-2.0.0/Makefile
+===
+--- gpac-2.0.0.orig/Makefile
 gpac-2.0.0/Makefile
+@@ -298,8 +298,9 @@ ifeq ($(GPAC_ENST),yes)
+ endif
+ 
+   $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(lib_dir)" || true
+-
++endif
+   $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+ 
+Index: gpac-2.0.0/configure
+===
+--- gpac-2.0.0.orig/configure
 gpac-2.0.0/configure
+@@ -106,6 +106,7 @@ has_dvb4linux="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -271,6 +272,7 @@ GPAC configuration options:
+   --static-modules use static modules in libgpac rather than dynamic 
library modules
+   --static-build   link statically against libgpac but still allow 
dependencies to shared libraries (enable --static-modules)
+   --enable-static-bin  old name for --static-build, deprecated
++  --enable-static-lib  GPAC static libraries build
+   --static-bin enable static linking of MP4Box and gpac only 
(enable --static-build), disable MP4Client and all libraries not linkable 
statically.
+   --static-mp4box  old name for --static-bin, deprecated
+   --enable-depth   enables depth handling in the compositor
+@@ -741,14 +743,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-CFLAGS="-O3 $CFLAGS"
+-else
+-CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -776,10 +770,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+ 
+ #look for zlib
+ cat > $TMPC << EOF
+@@ -1790,6 +1780,8 @@ for opt do
+ echo "$opt deprecated, use --static-build instead"
+ static_build="yes";
+ ;;
++--enable-static-libs) static_libs="yes";
++;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-platinum) has_platinum="no"
+@@ -2521,6 +2513,7 @@ else
+ fi
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3252,6 +3245,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+Index: gpac-2.0.0/src/Makefile
+===
+---

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2021-05-03 Thread Mikle Kolyada

commit: 4d545c609e3d3bc29d3da7f4f93bab0fa198c06c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 09:26:15 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 09:26:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d545c60

media-video/gpac: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/gpac/gpac-1.0.1.ebuild | 5 ++---
 media-video/gpac/gpac-.ebuild  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index c372803a25a..65ed5f65e28 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
libressl mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -45,8 +45,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
vorbis? ( media-libs/libvorbis )
X? (

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index abfcbc0e5d9..e1c72932c19 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
libressl mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -45,8 +45,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
vorbis? ( media-libs/libvorbis )
X? (

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2021-01-21 Thread Sam James

commit: 5f2a9819918f18f9001ff08a4ab2c9dec0f2861a
Author: John Helmert III  posteo  net>
AuthorDate: Wed Jan 20 01:37:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 22 03:34:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2a9819

media-video/gpac: cleanup for openjpeg cleanup

Closes: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19133
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/Manifest |   1 -
 media-video/gpac/files/gpac-0.8.1-configure.patch | 100 ---
 media-video/gpac/gpac-0.8.1.ebuild| 149 --
 3 files changed, 250 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3eb8fc2546c..3119d5d920e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
 DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 
80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db
 SHA512 
533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b

diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch 
b/media-video/gpac/files/gpac-0.8.1-configure.patch
deleted file mode 100644
index 4a6c97b6cf3..000
--- a/media-video/gpac/files/gpac-0.8.1-configure.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 61241cd..7481027 100644
 a/Makefile
-+++ b/Makefile
-@@ -270,7 +270,9 @@ ifeq ($(GPAC_ENST), yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
"$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
-   mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATIC_LIBS),yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(libdir)"
-+endif
-   if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
-   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
-   fi
-diff --git a/configure b/configure
-index 6ef2258..240b6b0 100755
 a/configure
-+++ b/configure
-@@ -108,6 +108,7 @@ has_xmlrpc="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -266,6 +267,7 @@ GPAC configuration options:
-   --enable-amr-wb  enable AMR WB library
-   --enable-amr enable both AMR NB and WB libraries
-   --enable-static-bin  link statically against libgpac
-+  --enable-static-lib  GPAC static libraries build
-   --static-mp4box  configure for static linking of MP4Box only.
-   --enable-depth   enables depth handling in the compositor
- 
-@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- fi
- 
--
--#GCC opt
--if test "$no_gcc_opt" = "no"; then
--CFLAGS="-O3 $CFLAGS"
--else
--CFLAGS="-O0 $CFLAGS"
--fi
--
--
- #GCC PIC
- if test "$cross_prefix" != "" ; then
- want_pic="no"
-@@ -1931,6 +1924,8 @@ for opt do
- ;;
- --enable-static-bin) static_build="yes";
- ;;
-+--enable-static-lib) static_libs="yes";
-+;;
- --disable-ipv6) has_ipv6="no"
- ;;
- --disable-wx) has_wx="no"
-@@ -2622,6 +2617,7 @@ echo "** GPAC $version rev$revision Core Configuration 
**"
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Sanitizer enabled: $enable_sanitizer"
- echo "Fixed-Point Version: $use_fixed_point"
-@@ -3291,6 +3287,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-diff --git a/src/Makefile b/src/Makefile
-index 935..b3464b7 100644
 a/src/Makefile
-+++ b/src/Makefile
-@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR)
- 
- ifeq ($(CONFIG_DARWIN),yes)
- 
-+ifeq ($(STATICLIBS),yes)
-   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
-   $(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
-   $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)  $(LDFLAGS)
- endif
- 
- else
--
-+ifeq

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2021-01-19 Thread Sam James

commit: e81addc5d84b2fff821ec83b4a8bf01644ecb103
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 20 00:39:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 20 00:39:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81addc5

media-video/gpac: Stabilize 1.0.1 ppc64, #747202

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 27fe93c249d..c372803a25a 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2021-01-19 Thread Sam James

commit: 802014aad489e7bcfc6dcc43885f19492c1299f9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 19 15:09:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 19 15:09:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802014aa

media-video/gpac: Stabilize 1.0.1 ppc, #747202

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 64c17c40591..27fe93c249d 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2021-01-18 Thread Sam James

commit: f85e47b72d027134d67b5dfde21fc1a97cce0d5f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 16:51:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 16:51:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85e47b7

media-video/gpac: Stabilize 1.0.1 sparc, #747202

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 8d9beec5a39..64c17c40591 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2021-01-18 Thread Sam James

commit: f25a7ab45c1a7345d741c183bb96de0967b67db1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 15:02:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 15:02:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25a7ab4

media-video/gpac: fix build on non amd64/x86

-mno-sse2 isn't valid on non amd64/x86.

Bug: https://bugs.gentoo.org/749972
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/gpac-1.0.1.ebuild | 15 +--
 media-video/gpac/gpac-.ebuild  | 16 ++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 806f4a7262b..8d9beec5a39 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.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
@@ -98,7 +98,6 @@ src_configure() {
tc-export CC CXX AR RANLIB
 
local myeconfargs=(
-   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose
@@ -134,6 +133,18 @@ src_configure() {
$(my_use vorbis)
$(my_use xvid)
)
+
+   if use amd64 || use x86 ; then
+   # Don't pass -mno-sse2 on non amd64/x86
+   myeconfargs+=(
+   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 
'-msse2' '-mno-sse2')"
+   )
+   else
+   myeconfargs+=(
+   --extra-cflags="${CFLAGS}"
+   )
+   fi
+
econf "${myeconfargs[@]}"
 }
 

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index e5828cfed45..abfcbc0e5d9 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.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
@@ -25,6 +25,7 @@ IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 
jack jpeg jpeg2k lib
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
media-libs/libogg
+   sys-libs/zlib
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
@@ -97,7 +98,6 @@ src_configure() {
tc-export CC CXX AR RANLIB
 
local myeconfargs=(
-   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose
@@ -133,6 +133,18 @@ src_configure() {
$(my_use vorbis)
$(my_use xvid)
)
+
+   if use amd64 || use x86 ; then
+   # Don't pass -mno-sse2 on non amd64/x86
+   myeconfargs+=(
+   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 
'-msse2' '-mno-sse2')"
+   )
+   else
+   myeconfargs+=(
+   --extra-cflags="${CFLAGS}"
+   )
+   fi
+
econf "${myeconfargs[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-12-28 Thread Sam James

commit: f31260cc889803eb32f939990092f638eb9bf928
Author: John Helmert III  posteo  net>
AuthorDate: Mon Dec 28 20:34:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 28 12:08:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31260cc

media-video/gpac: add zlib dep

Closes: https://bugs.gentoo.org/749972
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18858
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/gpac-1.0.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index 4a927bb8ae0..806f4a7262b 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -25,6 +25,7 @@ IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 
jack jpeg jpeg2k lib
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
media-libs/libogg
+   sys-libs/zlib
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-10-09 Thread Agostino Sarubbo

commit: 2ea6e1a64725d64c5e1bd0efc3d82e76c85c4dd0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct  9 08:39:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct  9 08:39:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea6e1a6

media-video/gpac: x86 stable wrt bug #747202

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index ab13621fe06..4a927bb8ae0 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-10-09 Thread Agostino Sarubbo

commit: 5031661059e10dc537e2a3f5d346cd8b248d7bc3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct  9 08:29:43 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct  9 08:30:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50316610

media-video/gpac: amd64 stable wrt bug #747202

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index e5828cfed45..ab13621fe06 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM} xdg

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/

2020-09-17 Thread Sam James

commit: 427db0fe3c70631bba70533b8bbfc7b85a1c55d0
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Sep 16 17:18:03 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 17 06:18:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427db0fe

media-video/gpac: remove unused patch

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17567
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/files/gpac-1.0.0-makefile-debian.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch 
b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
deleted file mode 100644
index 8bb8074b1ce..000
--- a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b147725..244b07c 100644
 a/Makefile
-+++ b/Makefile
-@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
-   $(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
-   $(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
- 
--ifeq ($(IS_DEB_MAKE),undefined)
-+ifeq ($(IS_DEB_MAKE),)
-   ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png 
$(DESTDIR)/usr/share/pixmaps/gpac.png
-   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop 
"$(DESTDIR)/usr/share/applications/"
- else

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2020-09-12 Thread Sam James

commit: b50d5fdee658b196969eac6a9f5a4a4394e18943
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 21:36:01 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 21:42:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50d5fde

media-video/gpac: bump to 1.0.1

Changes:
* Introduce CPU_FLAGS_X86_SSE2
* Refresh configure patch (avoids static libs)

Closes: https://bugs.gentoo.org/731088
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/Manifest |   1 +
 media-video/gpac/files/gpac-1.0.1-configure.patch | 117 ++
 media-video/gpac/gpac-1.0.1.ebuild| 143 ++
 3 files changed, 261 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 261a41794a2..85687ad16fe 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,3 @@
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
 DIST gpac-1.0.0.tar.gz 1028 BLAKE2B 
9bd1134a53c59fae59bb18a2e4f8c5db0639fbbc7e2270a16d8a621c3cb37529c7bdf536b0ac71227579b3b6c09305960775f6676a1f4d0f15b3cf3ae99b91ef
 SHA512 
930b4b02f1d68554a99b9fde3faf6a429d78a86522b52da7601a40907d41e159724c935952becc008ae626001cb23543e446125dfb58764513d5808197ec4e29
+DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 
80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db
 SHA512 
533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b

diff --git a/media-video/gpac/files/gpac-1.0.1-configure.patch 
b/media-video/gpac/files/gpac-1.0.1-configure.patch
new file mode 100644
index 000..e471157af6b
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.1-configure.patch
@@ -0,0 +1,117 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+
+diff --git a/Makefile b/Makefile
+index 303a413..1ef750e 100644
+--- a/Makefile
 b/Makefile
+@@ -284,8 +284,9 @@ ifeq ($(GPAC_ENST),yes)
+ endif
+ 
+   $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(lib_dir)" || true
+-
++endif
+   $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+ 
+diff --git a/configure b/configure
+index de8ea99..4f5a6a8 100755
+--- a/configure
 b/configure
+@@ -105,6 +105,7 @@ has_dvb4linux="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -264,6 +265,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  link statically against libgpac
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box only.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -706,14 +708,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-CFLAGS="-O3 $CFLAGS"
+-else
+-CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -1710,6 +1704,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build="yes";
+ ;;
++--enable-static-libs) static_libs="yes";
++;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-platinum) has_platinum="no"
+@@ -2357,6 +2353,7 @@ echo "** GPAC $version rev$revision Core Configuration 
**"
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3049,6 +3046,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+diff --git a/src/Makefile b/src/Makefile
+index c483c8d..b24d5bb 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -347,7 +347,6 @@ filters_svc: $(LIBGPAC_FILTERS_SVC)
+   @echo "LIBS $(EXTRALIBS)"
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
+   $(LIBTOOL) -s -o

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-09-12 Thread Sam James

commit: ae512a48236f5c1bbd077c39a1b03c2fede6d575
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 21:40:53 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 21:42:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae512a48

media-video/gpac: cleanup old

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

 media-video/gpac/Manifest  |   1 -
 media-video/gpac/gpac-1.0.0.ebuild | 144 -
 2 files changed, 145 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 85687ad16fe..3eb8fc2546c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,3 +1,2 @@
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
-DIST gpac-1.0.0.tar.gz 1028 BLAKE2B 
9bd1134a53c59fae59bb18a2e4f8c5db0639fbbc7e2270a16d8a621c3cb37529c7bdf536b0ac71227579b3b6c09305960775f6676a1f4d0f15b3cf3ae99b91ef
 SHA512 
930b4b02f1d68554a99b9fde3faf6a429d78a86522b52da7601a40907d41e159724c935952becc008ae626001cb23543e446125dfb58764513d5808197ec4e29
 DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 
80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db
 SHA512 
533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b

diff --git a/media-video/gpac/gpac-1.0.0.ebuild 
b/media-video/gpac/gpac-1.0.0.ebuild
deleted file mode 100644
index 7721c668112..000
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == * ]] ; then
-   SCM="git-r3"
-   EGIT_REPO_URI="https://github.com/gpac/gpac;
-else
-   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/;
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/10"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
-   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-   media-libs/libogg
-   a52? ( media-libs/a52dec )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( media-video/ffmpeg:0= )
-   jack? ( virtual/jack )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:2 )
-   mad? ( media-libs/libmad )
-   opengl? (
-   media-libs/freeglut
-   virtual/glu
-   virtual/opengl
-   )
-   png? ( media-libs/libpng:0= )
-   pulseaudio? ( media-sound/pulseaudio )
-   theora? ( media-libs/libtheora )
-   truetype? ( media-libs/freetype:2 )
-   sdl? ( media-libs/libsdl )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   vorbis? ( media-libs/libvorbis )
-   X? (
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext
-   )
-   xml? ( dev-libs/libxml2:2= )
-   xvid? ( media-libs/xvid )
-"
-DEPEND="
-   ${RDEPEND}
-   dvb? ( sys-kernel/linux-headers )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.8.1-configure.patch"
-   "${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
-   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
-)
-
-DOCS=(
-   share/doc/CODING_STYLE
-   share/doc/GPAC\ UPnP.doc
-   share/doc/ISO\ 639-2\ codes.txt
-   share/doc/SceneGenerators
-   share/doc/ipmpx_syntax.bt
-   Changelog
-   README.md
-)
-
-HTML_DOCS="share/doc/*.html"
-
-my_use() {
-   local flag="$1" pflag="${2:-$1}"
-   if use ${flag}; then
-   echo "--use-${pflag}=system"
-   else
-   echo "--use-${pflag}=no"
-   fi
-}
-
-src_prepare() {
-   default
-   sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-   tc-export CC CXX AR RANLIB
-
-   local myeconfargs=(
-   --extra-cflags="${CFLAGS}"
-   --cc="$(tc-getCC)"
-   --libdir="$(get_libdir)"
-   --verbose
-   --enable-pic
-   --enable-svg
-   --disable-amr
-   --use-js=no
-   --use-ogg=system
-   $(use_enable alsa)
-   $(use_enable debug)

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-09-12 Thread Sam James

commit: bc0a1924bdb2132722717404fbca9bf878da2cd8
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 21:18:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 21:42:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc0a1924

media-video/gpac: inherit xdg

Closes: https://bugs.gentoo.org/741574
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/gpac-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index eb3754e022a..add9cd2aa6d 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/;

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-09-12 Thread Sam James

commit: d7a8e110bc5424840c4fdc358913aff1662154cc
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 21:40:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 21:42:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a8e110

media-video/gpac: sync live

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

 media-video/gpac/gpac-1.0.1.ebuild | 2 +-
 media-video/gpac/gpac-.ebuild  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/gpac/gpac-1.0.1.ebuild 
b/media-video/gpac/gpac-1.0.1.ebuild
index a32cc796a65..e5828cfed45 100644
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -97,7 +97,7 @@ src_configure() {
tc-export CC CXX AR RANLIB
 
local myeconfargs=(
-   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'')"
+   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index add9cd2aa6d..e5828cfed45 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
libressl mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -63,7 +63,7 @@ DEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-0.8.1-configure.patch"
+   "${FILESDIR}/${PN}-1.0.1-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
@@ -97,7 +97,7 @@ src_configure() {
tc-export CC CXX AR RANLIB
 
local myeconfargs=(
-   --extra-cflags="${CFLAGS}"
+   --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' 
'-mno-sse2')"
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2020-09-08 Thread Sam James

commit: 62238af1490e6900856b6f8fdd196ab779b46e72
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  8 22:30:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  8 22:42:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62238af1

media-video/gpac: fix failed install for 1.0.0

Upstream are currently rewriting huge amounts
of their codebase. 0.8.x -> 1.0.0 marks a large change.

In this process, they inadverently broke non-Debian
builds by relying on "IS_DEB_MAKE" being set to
'undefined'.

We also change the openjpeg slot to :2 as per
changing upstream requirements.

Closes: https://bugs.gentoo.org/740404
Bug: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../gpac/files/gpac-1.0.0-makefile-debian.patch| 13 
 media-video/gpac/gpac-1.0.0.ebuild | 24 ++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch 
b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
new file mode 100644
index 000..8bb8074b1ce
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b147725..244b07c 100644
+--- a/Makefile
 b/Makefile
+@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
+   $(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+   $(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+ 
+-ifeq ($(IS_DEB_MAKE),undefined)
++ifeq ($(IS_DEB_MAKE),)
+   ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png 
$(DESTDIR)/usr/share/pixmaps/gpac.png
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop 
"$(DESTDIR)/usr/share/applications/"
+ else

diff --git a/media-video/gpac/gpac-1.0.0.ebuild 
b/media-video/gpac/gpac-1.0.0.ebuild
index 37ed1edce4a..6a8fe8c576a 100644
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ b/media-video/gpac/gpac-1.0.0.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
 
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
@@ -22,6 +22,7 @@ SLOT="0/10"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
media-libs/libogg
a52? ( media-libs/a52dec )
@@ -30,7 +31,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2 )
mad? ( media-libs/libmad )
opengl? (
media-libs/freeglut
@@ -53,15 +54,19 @@ RDEPEND="
x11-libs/libXv
x11-libs/libXext
)
-   xml? ( dev-libs/libxml2:2 )
+   xml? ( dev-libs/libxml2:2= )
xvid? ( media-libs/xvid )
 "
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
+DEPEND="
+   ${RDEPEND}
dvb? ( sys-kernel/linux-headers )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-0.8.1-configure.patch"
+   "${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
+   "${FILESDIR}/zlib.patch"
+)
 
 DOCS=(
share/doc/CODING_STYLE
@@ -72,6 +77,7 @@ DOCS=(
Changelog
README.md
 )
+
 HTML_DOCS="share/doc/*.html"
 
 my_use() {
@@ -94,7 +100,7 @@ src_configure() {
local myeconfargs=(
--extra-cflags="${CFLAGS}"
--cc="$(tc-getCC)"
-   --libdir="/$(get_libdir)"
+   --libdir="$(get_libdir)"
--verbose
--enable-pic
--enable-svg
@@ -133,6 +139,6 @@ src_configure() {
 
 src_install() {
einstalldocs
-   emake STRIP="true" DESTDIR="${D}" install
-   emake STRIP="true" DESTDIR="${D}" install-lib
+   emake STRIP="true" DESTDIR="${ED}" install
+   emake STRIP="true" DESTDIR="${ED}" install-lib
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2020-09-08 Thread Sam James

commit: c32af12a0308aa3e7cda2258acef74d81b0de57d
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  8 22:36:17 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  8 22:42:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32af12a

media-video/gpac: rename zlib patch

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

 media-video/gpac/files/{zlib.patch => gpac-1.0.0-zlib-compile.patch} | 0
 media-video/gpac/gpac-1.0.0.ebuild   | 2 +-
 media-video/gpac/gpac-.ebuild| 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/files/zlib.patch 
b/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch
similarity index 100%
rename from media-video/gpac/files/zlib.patch
rename to media-video/gpac/files/gpac-1.0.0-zlib-compile.patch

diff --git a/media-video/gpac/gpac-1.0.0.ebuild 
b/media-video/gpac/gpac-1.0.0.ebuild
index 6a8fe8c576a..7721c668112 100644
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ b/media-video/gpac/gpac-1.0.0.ebuild
@@ -65,7 +65,7 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-0.8.1-configure.patch"
"${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
-   "${FILESDIR}/zlib.patch"
+   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
 DOCS=(

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 1fcbfe48c82..eb3754e022a 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -64,7 +64,7 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-0.8.1-configure.patch"
-   "${FILESDIR}/zlib.patch"
+   "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
 DOCS=(

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-09-08 Thread Sam James

commit: 4c9fe03abb52a89c250d488d78013f1b64ea0ad5
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  8 22:34:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  8 22:42:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9fe03a

media-video/gpac: sync live ebuild

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

 media-video/gpac/gpac-.ebuild | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 37ed1edce4a..1fcbfe48c82 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.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
 
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
@@ -22,6 +22,7 @@ SLOT="0/10"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
media-libs/libogg
a52? ( media-libs/a52dec )
@@ -30,7 +31,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2 )
mad? ( media-libs/libmad )
opengl? (
media-libs/freeglut
@@ -53,15 +54,18 @@ RDEPEND="
x11-libs/libXv
x11-libs/libXext
)
-   xml? ( dev-libs/libxml2:2 )
+   xml? ( dev-libs/libxml2:2= )
xvid? ( media-libs/xvid )
 "
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
+DEPEND="
+   ${RDEPEND}
dvb? ( sys-kernel/linux-headers )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-0.8.1-configure.patch"
+   "${FILESDIR}/zlib.patch"
+)
 
 DOCS=(
share/doc/CODING_STYLE
@@ -72,6 +76,7 @@ DOCS=(
Changelog
README.md
 )
+
 HTML_DOCS="share/doc/*.html"
 
 my_use() {
@@ -94,7 +99,7 @@ src_configure() {
local myeconfargs=(
--extra-cflags="${CFLAGS}"
--cc="$(tc-getCC)"
-   --libdir="/$(get_libdir)"
+   --libdir="$(get_libdir)"
--verbose
--enable-pic
--enable-svg
@@ -133,6 +138,6 @@ src_configure() {
 
 src_install() {
einstalldocs
-   emake STRIP="true" DESTDIR="${D}" install
-   emake STRIP="true" DESTDIR="${D}" install-lib
+   emake STRIP="true" DESTDIR="${ED}" install
+   emake STRIP="true" DESTDIR="${ED}" install-lib
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2020-09-04 Thread Alexis Ballier

commit: 1d8ec424bccc9f21f88062ca9df4498f09dccf58
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Sep  4 16:13:19 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Sep  4 16:47:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8ec424

media-video/gpac: bump to 1.0.0

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

 media-video/gpac/Manifest  |  1 +
 media-video/gpac/files/zlib.patch  | 33 ++
 .../gpac/{gpac-.ebuild => gpac-1.0.0.ebuild}   | 22 ++-
 media-video/gpac/gpac-.ebuild  | 22 ++-
 4 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index fa53da9d266..261a41794a2 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
+DIST gpac-1.0.0.tar.gz 1028 BLAKE2B 
9bd1134a53c59fae59bb18a2e4f8c5db0639fbbc7e2270a16d8a621c3cb37529c7bdf536b0ac71227579b3b6c09305960775f6676a1f4d0f15b3cf3ae99b91ef
 SHA512 
930b4b02f1d68554a99b9fde3faf6a429d78a86522b52da7601a40907d41e159724c935952becc008ae626001cb23543e446125dfb58764513d5808197ec4e29

diff --git a/media-video/gpac/files/zlib.patch 
b/media-video/gpac/files/zlib.patch
new file mode 100644
index 000..c5b1fc4ab56
--- /dev/null
+++ b/media-video/gpac/files/zlib.patch
@@ -0,0 +1,33 @@
+Index: gpac-1.0.0/src/utils/gzio.c
+===
+--- gpac-1.0.0.orig/src/utils/gzio.c
 gpac-1.0.0/src/utils/gzio.c
+@@ -93,10 +93,10 @@ typedef struct gz_stream {
+ //local gzFile gz_open  OF((const char *path, const char *mode, int  fd));
+ //local int do_flushOF((gzFile file, int flush));
+ //local intget_byte OF((gz_stream *s));
+-local void   check_header OF((gz_stream *s));
+-local intdestroy  OF((gz_stream *s));
++local void   check_header _Z_OF((gz_stream *s));
++local intdestroy  _Z_OF((gz_stream *s));
+ //local void   putLong  OF((FILE *file, uLong x));
+-local uLong  getLong  OF((gz_stream *s));
++local uLong  getLong  _Z_OF((gz_stream *s));
+ 
+ /* ===
+  Opens a gzip (.gz) file for reading or writing. The mode parameter
+Index: gpac-1.0.0/src/utils/zutil.h
+===
+--- gpac-1.0.0.orig/src/utils/zutil.h
 gpac-1.0.0/src/utils/zutil.h
+@@ -262,8 +262,8 @@ extern void z_errorOF((char *m));
+ #endif
+ 
+ 
+-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+-void   zcfree  OF((voidpf opaque, voidpf ptr));
++voidpf zcalloc _Z_OF((voidpf opaque, unsigned items, unsigned size));
++void   zcfree  _Z_OF((voidpf opaque, voidpf ptr));
+ 
+ #define ZALLOC(strm, items, size) \
+(*((strm)->zalloc))((strm)->opaque, (items), (size))

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-1.0.0.ebuild
similarity index 89%
copy from media-video/gpac/gpac-.ebuild
copy to media-video/gpac/gpac-1.0.0.ebuild
index 5c4fcbaddd1..37ed1edce4a 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 
 LICENSE="GPL-2"
 # subslot == libgpac major
-SLOT="0/7"
+SLOT="0/10"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
@@ -56,28 +56,23 @@ RDEPEND="
xml? ( dev-libs/libxml2:2 )
xvid? ( media-libs/xvid )
 "
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
virtual/pkgconfig
dvb? ( sys-kernel/linux-headers )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
 
 DOCS=(
-   doc/CODING_STYLE
-   doc/GPAC\ UPnP.doc
-   doc/ISO\ 639-2\ codes.txt
-   doc/SceneGenerators
-   doc/ipmpx_syntax.bt
+   share/doc/CODING_STYLE
+   share/doc/GPAC\ UPnP.doc
+   share/doc/ISO\ 639-2\ codes.txt
+   share/doc/SceneGenerators
+   share/doc/ipmpx_syntax.bt
Changelog
-   AUTHORS
-   BUGS
README.md
-   TODO
 )
-HTML_DOCS="doc/*.html"
+HTML_DOCS="share/doc/*.html"
 
 my_use() {
local flag="$1" pflag="${2:-$1}"
@@ -104,7 +99,6 @@ src_configure() {
--enable-pic
--enable-svg
--disable-amr
-   --disable-wx

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2020-08-31 Thread Sam James

commit: a373cdf5df43887629aaf902bd080f6b7f46a10e
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 31 23:13:31 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 31 23:14:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a373cdf5

media-video/gpac: security cleanup

Bug: https://bugs.gentoo.org/711262
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/Manifest  |   1 -
 media-video/gpac/files/ffmpeg4.patch   |  44 --
 media-video/gpac/files/gpac-0.7.1-configure.patch  |  94 -
 .../gpac/files/gpac-0.7.1-openssl-1.1.patch| 126 -
 media-video/gpac/files/gpac-freetype.patch |  15 ---
 media-video/gpac/gpac-0.7.1-r1.ebuild  | 150 -
 6 files changed, 430 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 8340f361bd6..fa53da9d266 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 
795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9
 SHA512 
0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1

diff --git a/media-video/gpac/files/ffmpeg4.patch 
b/media-video/gpac/files/ffmpeg4.patch
deleted file mode 100644
index 61f329806a5..000
--- a/media-video/gpac/files/ffmpeg4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gpac-0.7.1/applications/dashcast/video_encoder.c
-===
 gpac-0.7.1.orig/applications/dashcast/video_encoder.c
-+++ gpac-0.7.1/applications/dashcast/video_encoder.c
-@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
-   }
- 
-   //the global header gives access to the extradata (SPS/PPS)
--  video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+  video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   video_output_file->vstream_idx = 0;//video_stream->index;
- 
-Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-===
 gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
-+++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-@@ -49,7 +49,7 @@
- static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
-   uint8_t * buffer;
-   /* Size of buffer must be larger, see avcodec_decode_video2 
documentation */
--  u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + 
size);
-+  u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + 
size);
-   if (oldBuffer)
-   gf_free(oldBuffer);
-   buffer = (uint8_t*)gf_malloc( allocatedSz );
-@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
-   capability->cap.valueInt = 1;
-   return GF_OK;
-   case GF_CODEC_PADDING_BYTES:
--  capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+  capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
-   return GF_OK;
-   case GF_CODEC_REORDER:
-   capability->cap.valueInt = 1;
-@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
-   break;
- 
-   case GF_CODEC_PADDING_BYTES:
--  capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+  capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
-   break;
-   default:
-   capability->cap.valueInt = 0;

diff --git a/media-video/gpac/files/gpac-0.7.1-configure.patch 
b/media-video/gpac/files/gpac-0.7.1-configure.patch
deleted file mode 100644
index 8bc3ec9f907..000
--- a/media-video/gpac/files/gpac-0.7.1-configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
 gpac-0.7.1/Makefile.orig   2017-07-25 09:34:51.910379115 -0600
-+++ gpac-0.7.1/Makefile2017-07-25 09:36:18.906385736 -0600
-@@ -252,7 +252,9 @@
-   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
"$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
-   mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATIC_LIBS),yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(libdir)"
-+endif
-   $(MAKE) installdylib
- 
- uninstall-lib:
 gpac-0.7.1/src/Makefile.orig   2017-07-25 09:37:48.157392528 -0600
-+++ gpac-0.7.1/src/Makefile2017-07-25 09:39:06.092398459 -0600
-@@ -267,16 +267,20 @@
- 
- ifeq ($(CONFIG_DARWIN),yes)
- 
-+ifeq

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-08-29 Thread Sam James

commit: 6727e7e430ced66e8748e3c0ac6b9e955aa56c62
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 30 04:06:12 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 30 04:06:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6727e7e4

media-video/gpac: Stabilize 0.8.1 ppc64, #711262

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

 media-video/gpac/gpac-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.8.1.ebuild 
b/media-video/gpac/gpac-0.8.1.ebuild
index faf8ebd7cc2..4404cc73915 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-08-29 Thread Sam James

commit: 3037c997b3880c0c448902c9fd7999a53df722da
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 30 03:56:50 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 30 03:57:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3037c997

media-video/gpac: Stabilize 0.8.1 ppc, #711262

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

 media-video/gpac/gpac-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.8.1.ebuild 
b/media-video/gpac/gpac-0.8.1.ebuild
index dc1db107fff..faf8ebd7cc2 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-08-25 Thread Sam James

commit: 38547f649a1ebb89248223140cd9bda0ebaa81ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 25 15:18:09 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 25 15:18:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38547f64

media-video/gpac: Stabilize 0.8.1 amd64, #711262

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

 media-video/gpac/gpac-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.8.1.ebuild 
b/media-video/gpac/gpac-0.8.1.ebuild
index cf3ab2036d5..dc1db107fff 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc x86"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-08-25 Thread Sam James

commit: 3d798c9b61d007082f0295ca5383ddec23944336
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 25 12:17:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 25 12:17:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d798c9b

media-video/gpac: Stabilize 0.8.1 x86, #711262

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

 media-video/gpac/gpac-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.8.1.ebuild 
b/media-video/gpac/gpac-0.8.1.ebuild
index 6acaf1cf5e3..cf3ab2036d5 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-08-25 Thread Sam James

commit: ec562a40d2d9ba44ecf72c2d32b22ee47718ff97
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 25 10:14:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 25 10:14:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec562a40

media-video/gpac: Stabilize 0.8.1 sparc, #711262

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

 media-video/gpac/gpac-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.8.1.ebuild 
b/media-video/gpac/gpac-0.8.1.ebuild
index 82441609b59..6acaf1cf5e3 100644
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc ~x86"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2020-08-20 Thread Sam James

commit: 4b34462e1b49b4b30ed014713f3011d5a246a91e
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 20 12:12:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 20 12:30:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b34462e

media-video/gpac: security bump to 0.8.1

We're bumping to 0.8.1 before 1.0.0 because there was
a substantial rewrite. The aim is to stabilise this release
first, give 1.0.0 (later commit) a few days in ~arch, then do that.

Bug: https://bugs.gentoo.org/711262
Closes: https://bugs.gentoo.org/701538
Closes: https://bugs.gentoo.org/654418
Closes: https://bugs.gentoo.org/658062
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sam James  gentoo.org>

 media-video/gpac/Manifest |   1 +
 media-video/gpac/files/gpac-0.8.1-configure.patch | 100 +++
 media-video/gpac/gpac-0.8.1.ebuild| 149 ++
 3 files changed, 250 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index ce5adb32da3..8340f361bd6 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 
795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9
 SHA512 
0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
+DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 
5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf
 SHA512 
f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1

diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch 
b/media-video/gpac/files/gpac-0.8.1-configure.patch
new file mode 100644
index 000..4a6c97b6cf3
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.8.1-configure.patch
@@ -0,0 +1,100 @@
+diff --git a/Makefile b/Makefile
+index 61241cd..7481027 100644
+--- a/Makefile
 b/Makefile
+@@ -270,7 +270,9 @@ ifeq ($(GPAC_ENST), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
"$(DESTDIR)$(prefix)/include/gpac/enst"
+ endif
+   mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
++ifeq ($(STATIC_LIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(libdir)"
++endif
+   if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
+   $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc 
"$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
+   fi
+diff --git a/configure b/configure
+index 6ef2258..240b6b0 100755
+--- a/configure
 b/configure
+@@ -108,6 +108,7 @@ has_xmlrpc="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -266,6 +267,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  link statically against libgpac
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box only.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ fi
+ 
+-
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-CFLAGS="-O3 $CFLAGS"
+-else
+-CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -1931,6 +1924,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build="yes";
+ ;;
++--enable-static-lib) static_libs="yes";
++;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-wx) has_wx="no"
+@@ -2622,6 +2617,7 @@ echo "** GPAC $version rev$revision Core Configuration 
**"
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3291,6 +3287,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+diff --git a/src/Makefile b/src/Makefile
+index 935..b3464b7 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR)
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+ 
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2020-04-26 Thread Mikle Kolyada

commit: 5023c0ba9ffbbc2bb74c523b5aae8fce5f6d6919
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 09:05:52 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 09:05:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5023c0ba

media-video/gpac: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 7 ++-
 media-video/gpac/gpac-.ebuild | 9 +++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 3266238bf22..bdac8071f89 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
-   ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
-   libav? ( media-video/libav:0= )
-   )
+   ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index c39142d9017..5c4fcbaddd1 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/;
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl 
oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
-   ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
-   libav? ( media-video/libav:0= )
-   )
+   ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2019-01-30 Thread Andreas Sturmlechner

commit: 1805b6d01458e4bfa5d4c373438dc3014a4b8ad1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 30 16:11:38 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 30 16:11:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1805b6d0

media-video/gpac: Drop 0.6.1-r2

Closes: https://bugs.gentoo.org/626240
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/Manifest  |   1 -
 media-video/gpac/files/110_all_implicitdecls.patch |  22 
 ...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch |  15 ---
 .../gpac/files/gpac-0.5.3-static-libs.patch|  85 --
 media-video/gpac/gpac-0.6.1-r2.ebuild  | 122 -
 5 files changed, 245 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 5b823f36870..ce5adb32da3 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 
943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a
 SHA512 
b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 
795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9
 SHA512 
0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403

diff --git a/media-video/gpac/files/110_all_implicitdecls.patch 
b/media-video/gpac/files/110_all_implicitdecls.patch
deleted file mode 100644
index 71017b53b9e..000
--- a/media-video/gpac/files/110_all_implicitdecls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===
 gpac.orig/applications/generators/SVG/svggen.h
-+++ gpac/applications/generators/SVG/svggen.h
-@@ -107,6 +107,17 @@ typedef struct {
- } SVGGenAttrGrp;
- 
- 
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generate_laser_tables_da(GF_List *atts);
-+void generate_laser_tables(GF_List *svg_elements);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char 
*pointer_root, u32 start);
-+void svgNameToImplementationName(xmlChar *svg_name, char 
implementation_name[50]);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
- 
- /***
-  * Structures needed for static allocation *

diff --git 
a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 
b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
deleted file mode 100644
index df3a5fc3299..000
--- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Export gf_isom_set_pixel_aspect_ratio.
-media-video/x264-encoder needs it and this funcion used to be exported.
-
-diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
-index e935acc..9841d85 100644
 a/src/isomedia/isom_write.c
-+++ b/src/isomedia/isom_write.c
-@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 
trackNumber, u32 StreamDes
-   }
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 
StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
- {
-   GF_Err e;

diff --git a/media-video/gpac/files/gpac-0.5.3-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
deleted file mode 100644
index ec11eaea172..000
--- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 62b7850..ff4b589 100644
 a/Makefile
-+++ b/Makefile
-@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
"$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
-   mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATICLIBS),yes)
-   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(libdir)"
-+endif
-   $(MAKE) installdylib
- 
- uninstall-lib:
-diff --git a/configure b/configure
-index df00dff..561bcd3 100755
 a/configure
-+++ b/configure
-@@ -101,6 +101,7 @@ has_xmlrpc="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -252,6 +253,7 @@ GPAC configuration options:
-   --enable-amr-wb  enable

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2019-01-30 Thread Tobias Klausmann

commit: df10dd39ac3feaaa427c4f66f132e53423e84699
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Jan 30 16:04:12 2019 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Jan 30 16:04:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df10dd39

media-video/gpac-0.7.1-r1: alpha stable

Bug: http://bugs.gentoo.org/669966
Signed-off-by: Tobias Klausmann  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 470e9607ff7..ff65e99eef4 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+   KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-12-15 Thread Sergei Trofimovich

commit: f9f87890401312e846fa1eaccd025a142cd7e1c1
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 15 12:45:19 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 15 12:50:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f87890

media-video/gpac: stable 0.7.1-r1 for sparc, bug #669966

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 54aba6be16f..470e9607ff7 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-12-13 Thread Mikle Kolyada

commit: 60f5552e26f5968bd4868f50075aa509179b8c1d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Dec 13 15:38:53 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Dec 13 15:38:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f5552e

media-video/gpac: amd64 stable wrt bug #669966

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index a5fe2274c76..54aba6be16f 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-12-08 Thread Sergei Trofimovich

commit: 025713b56ef4a27ef6af022d96624747ab0a6843
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec  8 09:38:51 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec  8 09:44:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025713b5

media-video/gpac: stable 0.7.1-r1 for ppc64, bug #669966

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

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 067c83a74ae..a5fe2274c76 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-12-08 Thread Sergei Trofimovich

commit: b3a94ab27370de484f20a8fdea6bc9fcade01f2c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Dec  8 09:32:58 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec  8 09:32:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a94ab2

media-video/gpac: stable 0.7.1-r1 for ppc, bug #669966

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

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index dffc318ad27..067c83a74ae 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-12-06 Thread Thomas Deutschmann

commit: cac6076ee01edf74b07f3bf12edb732b49676f0c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  7 02:11:59 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  7 02:40:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac6076e

media-video/gpac: x86 stable (bug #669966)

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

 media-video/gpac/gpac-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 4067f4f19a2..dffc318ad27 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/gpac/gpac;
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: 74793899ab944720f87571797843a52903e3010d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:38:41 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74793899

media-video/gpac: Sort DEPENDs and cleanup, one line per dep

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 35 +--
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 9b94d9fe254..972c9aafb6b 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -23,41 +23,48 @@ IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
libav libressl mad ope
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
+   media-libs/libogg
a52? ( media-libs/a52dec )
-   aac? ( >=media-libs/faad2-2.0 )
+   aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
dvb? ( media-tv/linuxtv-dvb-apps )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
-   libav? ( media-video/libav:0= ) )
+   libav? ( media-video/libav:0= )
+   )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   mad? ( >=media-libs/libmad-0.15.1b )
-   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-   >=media-libs/libogg-1.1
-   png? ( >=media-libs/libpng-1.4:0= )
-   vorbis? ( >=media-libs/libvorbis-1.1 )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   mad? ( media-libs/libmad )
+   opengl? (
+   media-libs/freeglut
+   virtual/glu
+   virtual/opengl
+   )
+   png? ( media-libs/libpng:0= )
+   pulseaudio? ( media-sound/pulseaudio )
theora? ( media-libs/libtheora )
-   truetype? ( >=media-libs/freetype-2.1.4:2 )
-   xml? ( >=dev-libs/libxml2-2.6.0:2 )
-   xvid? ( >=media-libs/xvid-1.0.1 )
+   truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )
-   jpeg2k? ( media-libs/openjpeg:0 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= ) )
-   pulseaudio? ( media-sound/pulseaudio )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   vorbis? ( media-libs/libvorbis )
X? (
x11-libs/libXt
x11-libs/libX11
x11-libs/libXv
x11-libs/libXext
)
+   xml? ( dev-libs/libxml2:2 )
+   xvid? ( media-libs/xvid )
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: b3a0728dbe588d58a4c1df2afbcc7a101d18db95
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:57:37 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a0728d

media-video/gpac: Drop 0.7.1 (r0)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-0.7.1.ebuild | 141 -
 1 file changed, 141 deletions(-)

diff --git a/media-video/gpac/gpac-0.7.1.ebuild 
b/media-video/gpac/gpac-0.7.1.ebuild
deleted file mode 100644
index 73698dcdb6b..000
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == * ]] ; then
-   SCM="git-r3"
-   EGIT_REPO_URI="https://github.com/gpac/gpac;
-else
-   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/;
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
-   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
-   a52? ( media-libs/a52dec )
-   aac? ( >=media-libs/faad2-2.0 )
-   alsa? ( media-libs/alsa-lib )
-   dvb? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? (
-   !libav? ( media-video/ffmpeg:0= )
-   libav? ( media-video/libav:0= ) )
-   jack? ( media-sound/jack-audio-connection-kit )
-   jpeg? ( virtual/jpeg:0 )
-   mad? ( >=media-libs/libmad-0.15.1b )
-   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-   >=media-libs/libogg-1.1
-   png? ( >=media-libs/libpng-1.4:0= )
-   vorbis? ( >=media-libs/libvorbis-1.1 )
-   theora? ( media-libs/libtheora )
-   truetype? ( >=media-libs/freetype-2.1.4:2 )
-   xml? ( >=dev-libs/libxml2-2.6.0:2 )
-   xvid? ( >=media-libs/xvid-1.0.1 )
-   sdl? ( media-libs/libsdl )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= ) )
-   pulseaudio? ( media-sound/pulseaudio )
-   X? (
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext
-   )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
-PATCHES=(
-   "${FILESDIR}/${PN}-0.7.1-configure.patch"
-   "${FILESDIR}/ffmpeg4.patch"
-   "${FILESDIR}/${PN}-freetype.patch"
-   "${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-DOCS=(
-   doc/CODING_STYLE
-   doc/GPAC\ UPnP.doc
-   doc/ISO\ 639-2\ codes.txt
-   doc/SceneGenerators
-   doc/ipmpx_syntax.bt
-   Changelog
-   AUTHORS
-   BUGS
-   README.md
-   TODO
-)
-HTML_DOCS="doc/*.html"
-
-my_use() {
-   local flag="$1" pflag="${2:-$1}"
-   if use ${flag}; then
-   echo "--use-${pflag}=system"
-   else
-   echo "--use-${pflag}=no"
-   fi
-}
-
-src_prepare() {
-   default
-   sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-   tc-export CC CXX AR RANLIB
-
-   econf \
-   --enable-svg \
-   --enable-pic \
-   --disable-amr \
-   --use-js=no \
-   --use-ogg=system \
-   $(use_enable alsa) \
-   $(use_enable debug) \
-   $(use_enable ipv6) \
-   $(use_enable jack jack yes) \
-   $(use_enable opengl 3d) \
-   $(use_enable oss oss-audio) \
-   $(use_enable pulseaudio pulseaudio yes) \
-   $(use_enable sdl) \
-   $(use_enable ssl) \
-   $(use_enable static-libs static-lib) \
-   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
-   --disable-wx \
-   $(my_use a52) \
-   $(my_use aac faad) \
-   $(my_use dvb dvbx) \
-   $(my_use ffmpeg) \
-   $(my_use jpeg) \
-   $(my_use jpeg2k openjpeg) \
-   $(my_use mad) \
-   $(my_use png) \
-   $(my_use theora) \
-   $(my_use truetype ft) \
-   $(my_use vorbis) \
-   $(my_use xvid) \
-

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: 900ceda32c7f0d58994ba58fb09f78b05dd6327f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:48:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900ceda3

media-video/gpac: Drop bogus media-tv/linuxtv-dvb-apps from USE dvb

Thanks-to: James Le Cuirot  gentoo.org>
Bug: https://bugs.gentoo.org/626240
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 972c9aafb6b..021a7cebfda 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -27,7 +27,6 @@ RDEPEND="
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
-   dvb? ( media-tv/linuxtv-dvb-apps )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
@@ -64,6 +63,7 @@ RDEPEND="
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
virtual/pkgconfig
+   dvb? ( sys-kernel/linux-headers )
 "
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
@@ -113,6 +113,7 @@ src_configure() {
--use-ogg=system \
$(use_enable alsa) \
$(use_enable debug) \
+   $(use_enable dvb dvb4linux) \
$(use_enable ipv6) \
$(use_enable jack jack yes) \
$(use_enable opengl 3d) \

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: 3a9e8623050edfae327102a382be3173fcfafbef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:52:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9e8623

media-video/gpac: Sort build flags, use myeconfargs array

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 72 ++-
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 021a7cebfda..4067f4f19a2 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -105,41 +105,45 @@ src_prepare() {
 src_configure() {
tc-export CC CXX AR RANLIB
 
-   econf \
-   --enable-svg \
-   --enable-pic \
-   --disable-amr \
-   --use-js=no \
-   --use-ogg=system \
-   $(use_enable alsa) \
-   $(use_enable debug) \
-   $(use_enable dvb dvb4linux) \
-   $(use_enable ipv6) \
-   $(use_enable jack jack yes) \
-   $(use_enable opengl 3d) \
-   $(use_enable oss oss-audio) \
-   $(use_enable pulseaudio pulseaudio yes) \
-   $(use_enable sdl) \
-   $(use_enable ssl) \
-   $(use_enable static-libs static-lib) \
-   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
-   --disable-wx \
-   $(my_use a52) \
-   $(my_use aac faad) \
-   $(my_use dvb dvbx) \
-   $(my_use ffmpeg) \
-   $(my_use jpeg) \
-   $(my_use jpeg2k openjpeg) \
-   $(my_use mad) \
-   $(my_use png) \
-   $(my_use theora) \
-   $(my_use truetype ft) \
-   $(my_use vorbis) \
-   $(my_use xvid) \
-   --extra-cflags="${CFLAGS}" \
-   --cc="$(tc-getCC)" \
-   --libdir="/$(get_libdir)" \
+   local myeconfargs=(
+   --extra-cflags="${CFLAGS}"
+   --cc="$(tc-getCC)"
+   --libdir="/$(get_libdir)"
--verbose
+   --enable-pic
+   --enable-svg
+   --disable-amr
+   --disable-wx
+   --use-js=no
+   --use-ogg=system
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable dvb dvb4linux)
+   $(use_enable ipv6)
+   $(use_enable jack jack yes)
+   $(use_enable opengl 3d)
+   $(use_enable oss oss-audio)
+   $(use_enable pulseaudio pulseaudio yes)
+   $(use_enable sdl)
+   $(use_enable ssl)
+   $(use_enable static-libs static-lib)
+   $(use_enable X x11)
+   $(use_enable X x11-shm)
+   $(use_enable X x11-xv)
+   $(my_use a52)
+   $(my_use aac faad)
+   $(my_use dvb dvbx)
+   $(my_use ffmpeg)
+   $(my_use jpeg)
+   $(my_use jpeg2k openjpeg)
+   $(my_use mad)
+   $(my_use png)
+   $(my_use theora)
+   $(my_use truetype ft)
+   $(my_use vorbis)
+   $(my_use xvid)
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: 244a5252d72f3ed718413202c7fef5aed9ad6073
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:54:43 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244a5252

media-video/gpac: Sync  with 0.7.1-r1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-.ebuild | 110 +-
 1 file changed, 61 insertions(+), 49 deletions(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 0beb2918a9d..5acc9d8e2d3 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -23,41 +23,48 @@ IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k 
libav libressl mad ope
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
+   media-libs/libogg
a52? ( media-libs/a52dec )
-   aac? ( >=media-libs/faad2-2.0 )
+   aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
-   dvb? ( media-tv/linuxtv-dvb-apps )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
-   libav? ( media-video/libav:0= ) )
-   jack? ( media-sound/jack-audio-connection-kit )
+   libav? ( media-video/libav:0= )
+   )
+   jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
-   mad? ( >=media-libs/libmad-0.15.1b )
-   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-   >=media-libs/libogg-1.1
-   png? ( >=media-libs/libpng-1.4:0= )
-   vorbis? ( >=media-libs/libvorbis-1.1 )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   mad? ( media-libs/libmad )
+   opengl? (
+   media-libs/freeglut
+   virtual/glu
+   virtual/opengl
+   )
+   png? ( media-libs/libpng:0= )
+   pulseaudio? ( media-sound/pulseaudio )
theora? ( media-libs/libtheora )
-   truetype? ( >=media-libs/freetype-2.1.4:2 )
-   xml? ( >=dev-libs/libxml2-2.6.0:2 )
-   xvid? ( >=media-libs/xvid-1.0.1 )
+   truetype? ( media-libs/freetype:2 )
sdl? ( media-libs/libsdl )
-   jpeg2k? ( media-libs/openjpeg:0 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= ) )
-   pulseaudio? ( media-sound/pulseaudio )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   vorbis? ( media-libs/libvorbis )
X? (
x11-libs/libXt
x11-libs/libX11
x11-libs/libXv
x11-libs/libXext
)
+   xml? ( dev-libs/libxml2:2 )
+   xvid? ( media-libs/xvid )
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+   virtual/pkgconfig
+   dvb? ( sys-kernel/linux-headers )
+"
 
 PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
 
@@ -92,40 +99,45 @@ src_prepare() {
 src_configure() {
tc-export CC CXX AR RANLIB
 
-   econf \
-   --enable-svg \
-   --enable-pic \
-   --disable-amr \
-   --use-js=no \
-   --use-ogg=system \
-   $(use_enable alsa) \
-   $(use_enable debug) \
-   $(use_enable ipv6) \
-   $(use_enable jack jack yes) \
-   $(use_enable opengl 3d) \
-   $(use_enable oss oss-audio) \
-   $(use_enable pulseaudio pulseaudio yes) \
-   $(use_enable sdl) \
-   $(use_enable ssl) \
-   $(use_enable static-libs static-lib) \
-   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
-   --disable-wx \
-   $(my_use a52) \
-   $(my_use aac faad) \
-   $(my_use dvb dvbx) \
-   $(my_use ffmpeg) \
-   $(my_use jpeg) \
-   $(my_use jpeg2k openjpeg) \
-   $(my_use mad) \
-   $(my_use png) \
-   $(my_use theora) \
-   $(my_use truetype ft) \
-   $(my_use vorbis) \
-   $(my_use xvid) \
-   --extra-cflags="${CFLAGS}" \
-   --cc="$(tc-getCC)" \
-   --libdir="/$(get_libdir)" \
+   local myeconfargs=(
+   --extra-cflags="${CFLAGS}"
+   --cc="$(tc-getCC)"
+   --libdir="/$(get_libdir)"
--verbose
+   --enable-pic
+   --enable-svg
+   --disable-amr
+   --disable-wx
+   --use-js=no
+   --use-ogg=system
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable dvb dvb4linux)
+   $(use_enable ipv6)
+   $(use_enable jack jack yes)
+

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-11-29 Thread Andreas Sturmlechner

commit: f7cd7ef9a95742dee1a05ea0d4fde02b938df4e6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:29:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 23:01:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cd7ef9

media-video/gpac: Someone claimed it works with jack2

So let them have it.

Reported-by: gerion  flump.de>
Closes: https://bugs.gentoo.org/636598
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/gpac/gpac-0.7.1-r1.ebuild | 141 ++
 1 file changed, 141 insertions(+)

diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild 
b/media-video/gpac/gpac-0.7.1-r1.ebuild
new file mode 100644
index 000..9b94d9fe254
--- /dev/null
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == * ]] ; then
+   SCM="git-r3"
+   EGIT_REPO_URI="https://github.com/gpac/gpac;
+else
+   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+inherit flag-o-matic toolchain-funcs ${SCM}
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/;
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/7"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
+   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+RDEPEND="
+   a52? ( media-libs/a52dec )
+   aac? ( >=media-libs/faad2-2.0 )
+   alsa? ( media-libs/alsa-lib )
+   dvb? ( media-tv/linuxtv-dvb-apps )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:0= ) )
+   jack? ( virtual/jack )
+   jpeg? ( virtual/jpeg:0 )
+   mad? ( >=media-libs/libmad-0.15.1b )
+   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+   >=media-libs/libogg-1.1
+   png? ( >=media-libs/libpng-1.4:0= )
+   vorbis? ( >=media-libs/libvorbis-1.1 )
+   theora? ( media-libs/libtheora )
+   truetype? ( >=media-libs/freetype-2.1.4:2 )
+   xml? ( >=dev-libs/libxml2-2.6.0:2 )
+   xvid? ( >=media-libs/xvid-1.0.1 )
+   sdl? ( media-libs/libsdl )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= ) )
+   pulseaudio? ( media-sound/pulseaudio )
+   X? (
+   x11-libs/libXt
+   x11-libs/libX11
+   x11-libs/libXv
+   x11-libs/libXext
+   )
+"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
+PATCHES=(
+   "${FILESDIR}/${PN}-0.7.1-configure.patch"
+   "${FILESDIR}/ffmpeg4.patch"
+   "${FILESDIR}/${PN}-freetype.patch"
+   "${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
+DOCS=(
+   doc/CODING_STYLE
+   doc/GPAC\ UPnP.doc
+   doc/ISO\ 639-2\ codes.txt
+   doc/SceneGenerators
+   doc/ipmpx_syntax.bt
+   Changelog
+   AUTHORS
+   BUGS
+   README.md
+   TODO
+)
+HTML_DOCS="doc/*.html"
+
+my_use() {
+   local flag="$1" pflag="${2:-$1}"
+   if use ${flag}; then
+   echo "--use-${pflag}=system"
+   else
+   echo "--use-${pflag}=no"
+   fi
+}
+
+src_prepare() {
+   default
+   sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+   tc-export CC CXX AR RANLIB
+
+   econf \
+   --enable-svg \
+   --enable-pic \
+   --disable-amr \
+   --use-js=no \
+   --use-ogg=system \
+   $(use_enable alsa) \
+   $(use_enable debug) \
+   $(use_enable ipv6) \
+   $(use_enable jack jack yes) \
+   $(use_enable opengl 3d) \
+   $(use_enable oss oss-audio) \
+   $(use_enable pulseaudio pulseaudio yes) \
+   $(use_enable sdl) \
+   $(use_enable ssl) \
+   $(use_enable static-libs static-lib) \
+   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
+   --disable-wx \
+   $(my_use a52) \
+   $(my_use aac faad) \
+   $(my_use dvb dvbx) \
+   $(my_use ffmpeg) \
+   $(my_use jpeg) \
+   $(my_use jpeg2k openjpeg) \
+   $(my_use mad) \
+   $(my_use png) \
+   $(my_use theora) \
+   $(my_use truetype ft) \
+

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-10-30 Thread Andreas Sturmlechner

commit: 94543eea4a7fe9b8b954237f99a66d0c6e09f82a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 30 14:41:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 30 15:13:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94543eea

media-video/gpac: Drop unused eutils,multilib

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/gpac/gpac-0.7.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.7.1.ebuild 
b/media-video/gpac/gpac-0.7.1.ebuild
index fea54fdfefe..73698dcdb6b 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ else
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM}
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/;

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2018-10-30 Thread Andreas Sturmlechner

commit: 20efd03e10052684b6bf79f2a593ae5687e2eaad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 30 14:52:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 30 15:13:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20efd03e

media-video/gpac: Sync  with 0.7.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/gpac/gpac-.ebuild | 63 +--
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 1853504344e..0beb2918a9d 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS=""
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM}
 
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard 
developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/;
 
 LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+# subslot == libgpac major
+SLOT="0/7"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,32 +27,53 @@ RDEPEND="
aac? ( >=media-libs/faad2-2.0 )
alsa? ( media-libs/alsa-lib )
dvb? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:0= ) )
jack? ( media-sound/jack-audio-connection-kit )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( virtual/jpeg:0 )
mad? ( >=media-libs/libmad-0.15.1b )
opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
>=media-libs/libogg-1.1
-   png? ( >=media-libs/libpng-1.4 )
+   png? ( >=media-libs/libpng-1.4:0= )
vorbis? ( >=media-libs/libvorbis-1.1 )
theora? ( media-libs/libtheora )
-   truetype? ( >=media-libs/freetype-2.1.4 )
-   xml? ( >=dev-libs/libxml2-2.6.0 )
+   truetype? ( >=media-libs/freetype-2.1.4:2 )
+   xml? ( >=dev-libs/libxml2-2.6.0:2 )
xvid? ( >=media-libs/xvid-1.0.1 )
sdl? ( media-libs/libsdl )
jpeg2k? ( media-libs/openjpeg:0 )
-   ssl? ( dev-libs/openssl )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= ) )
pulseaudio? ( media-sound/pulseaudio )
X? (
x11-libs/libXt
x11-libs/libX11
x11-libs/libXv
x11-libs/libXext
-   )"
+   )
+"
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
 
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+
+DOCS=(
+   doc/CODING_STYLE
+   doc/GPAC\ UPnP.doc
+   doc/ISO\ 639-2\ codes.txt
+   doc/SceneGenerators
+   doc/ipmpx_syntax.bt
+   Changelog
+   AUTHORS
+   BUGS
+   README.md
+   TODO
+)
+HTML_DOCS="doc/*.html"
 
 my_use() {
local flag="$1" pflag="${2:-$1}"
@@ -64,9 +85,7 @@ my_use() {
 }
 
 src_prepare() {
-   epatch  "${FILESDIR}"/110_all_implicitdecls.patch \
-   "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
-   
"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+   default
sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
 }
 
@@ -83,7 +102,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable ipv6) \
$(use_enable jack jack yes) \
-   $(use_enable opengl) \
+   $(use_enable opengl 3d) \
$(use_enable oss oss-audio) \
$(use_enable pulseaudio pulseaudio yes) \
$(use_enable sdl) \
@@ -110,9 +129,7 @@ src_configure() {
 }
 
 src_install() {
+   einstalldocs
emake STRIP="true" DESTDIR="${D}" install
emake STRIP="true" DESTDIR="${D}" install-lib
-   dodoc AUTHORS BUGS Changelog README.md TODO
-   dodoc doc/*.txt
-   dohtml doc/*.html
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2018-06-13 Thread Lars Wendler

commit: 02e7c018532a058fa4d5c73cbe74fca48f085f19
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 13 15:53:08 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 13 16:20:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e7c018

media-video/gpac: Fixed build with openssl-1.1

Closes: https://bugs.gentoo.org/592550
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../gpac/files/gpac-0.7.1-openssl-1.1.patch| 126 +
 media-video/gpac/gpac-0.7.1.ebuild |   1 +
 2 files changed, 127 insertions(+)

diff --git a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch 
b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
new file mode 100644
index 000..e25a5bca78b
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
@@ -0,0 +1,126 @@
+From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
+From: Aurelien David 
+Date: Fri, 6 Oct 2017 16:46:18 +0200
+Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
+
+diff --git a/src/utils/downloader.c b/src/utils/downloader.c
+index b8c923b88..3b7d37b41 100644
+--- a/src/utils/downloader.c
 b/src/utils/downloader.c
+@@ -204,7 +204,7 @@ struct __gf_download_manager
+   u32 limit_data_rate, read_buf_size;
+   u64 max_cache_size;
+   Bool allow_broken_certificate;
+-  
++
+   GF_List *skip_proxy_servers;
+   GF_List *credentials;
+   GF_List *cache_entries;
+@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
+   GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while 
initializing Random Number generator, failed to init SSL !\n"));
+   return GF_TRUE;
+   }
++
++  /* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
++  ** As of version 1.1.0 OpenSSL will automatically allocate all 
resources that it needs so no explicit initialisation is required.
++  ** Similarly it will also automatically deinitialise as required.
++  */
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+   SSL_library_init();
+   SSL_load_error_strings();
+   SSLeay_add_all_algorithms();
+   SSLeay_add_ssl_algorithms();
++#endif
++
+   _ssl_is_initialized = GF_TRUE;
+   GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL 
library complete.\n"));
+   return GF_FALSE;
+@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+   }
+ 
+   switch (mode) {
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+   case 0:
+   meth = SSLv23_client_method();
+   break;
+@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+   case 3:
+   meth = TLSv1_client_method();
+   break;
++#else /* for openssl 1.1+ this is the prefered method */
++  case 0:
++  meth = TLS_client_method();
++  break;
++#endif
+   default:
+   goto error;
+   }
+@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
+   gf_sk_del(sess->sock);
+   gf_list_del(sess->headers);
+   gf_mx_del(sess->mx);
+-  
++
+   gf_free(sess);
+   GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) 
: DONE\n", sess ));
+ }
+@@ -1145,7 +1159,7 @@ GF_DownloadSession 
*gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ {
+   GF_DownloadSession *sess;
+   if (!dm) return NULL;
+-  
++
+   GF_SAFEALLOC(sess, GF_DownloadSession);
+   if (!sess) {
+   GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate 
session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
+@@ -1166,8 +1180,8 @@ GF_DownloadSession 
*gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+   gf_free(sess);
+   return NULL;
+   }
+-  
+-  
++
++
+   assert( dm );
+ 
+   *e = gf_dm_sess_setup_from_url(sess, url);
+@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, 
char *data, u32 data_siz
+   gf_mx_v(sess->mx);
+   return GF_IP_CONNECTION_CLOSED;
+   }
+-  
++
+ #ifdef GPAC_HAS_SSL
+   if (sess->ssl) {
+   s32 size;
+@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
+   const GENERAL_NAME 
*altname = sk_GENERAL_NAME_value(altnames, i);
+   if (altname->type == 
GEN_DNS)
+   {
+-  unsigned char 
*altname_str = ASN1_STRING_data(altname->d.ia5);
++  #if 
OPENSSL_VERSION_NUMBER < 0x1010L
++  
unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2018-05-08 Thread Lars Wendler

commit: 59bd97f12ae21d1a47dae7ca0d0ea77569ebca65
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue May  8 18:31:58 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May  8 18:32:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bd97f1

media-video/gpac: Use pkg-config to find freetype

Thanks to Bernd Feige who reported the issue and provided a patch.

Bug: https://bugs.gentoo.org/655272
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-video/gpac/files/gpac-freetype.patch | 15 +++
 media-video/gpac/gpac-0.7.1.ebuild |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/media-video/gpac/files/gpac-freetype.patch 
b/media-video/gpac/files/gpac-freetype.patch
new file mode 100644
index 000..98224aff30e
--- /dev/null
+++ b/media-video/gpac/files/gpac-freetype.patch
@@ -0,0 +1,15 @@
+Index: gpac-0.7.1/configure
+===
+--- gpac-0.7.1.orig/configure
 gpac-0.7.1/configure
+@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag
+ fi
+ if test "$cross_prefix" = "" ; then
+ if test "$has_ft" = "no" ; then
+-ft_cflags="`freetype-config --cflags 2>>$logs`"
+-ft_lflags="`freetype-config --libs 2>>$logs`"
++ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
++ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
+ if docc $ft_cflags $ft_lflags $LDFLAGS ; then
+ has_ft="system"
+ fi

diff --git a/media-video/gpac/gpac-0.7.1.ebuild 
b/media-video/gpac/gpac-0.7.1.ebuild
index ca4acbd586e..ed5c090d045 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -56,12 +56,14 @@ RDEPEND="
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
"${FILESDIR}/${PN}-0.7.1-configure.patch"
"${FILESDIR}/ffmpeg4.patch"
+   "${FILESDIR}/${PN}-freetype.patch"
 )
 
 DOCS=(

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2018-04-20 Thread Alexis Ballier

commit: 0e30c98c3d9687a5128deb9eccffe317faca8d06
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Apr 20 17:25:06 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Apr 20 18:11:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e30c98c

media-video/gpac: fix build with ffmpeg4

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-video/gpac/files/ffmpeg4.patch | 44 
 media-video/gpac/gpac-0.7.1.ebuild   |  3 ++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/media-video/gpac/files/ffmpeg4.patch 
b/media-video/gpac/files/ffmpeg4.patch
new file mode 100644
index 000..61f329806a5
--- /dev/null
+++ b/media-video/gpac/files/ffmpeg4.patch
@@ -0,0 +1,44 @@
+Index: gpac-0.7.1/applications/dashcast/video_encoder.c
+===
+--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c
 gpac-0.7.1/applications/dashcast/video_encoder.c
+@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
+   }
+ 
+   //the global header gives access to the extradata (SPS/PPS)
+-  video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++  video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   video_output_file->vstream_idx = 0;//video_stream->index;
+ 
+Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+===
+--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
 gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+@@ -49,7 +49,7 @@
+ static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+   uint8_t * buffer;
+   /* Size of buffer must be larger, see avcodec_decode_video2 
documentation */
+-  u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + 
size);
++  u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + 
size);
+   if (oldBuffer)
+   gf_free(oldBuffer);
+   buffer = (uint8_t*)gf_malloc( allocatedSz );
+@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+   capability->cap.valueInt = 1;
+   return GF_OK;
+   case GF_CODEC_PADDING_BYTES:
+-  capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++  capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+   return GF_OK;
+   case GF_CODEC_REORDER:
+   capability->cap.valueInt = 1;
+@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+   break;
+ 
+   case GF_CODEC_PADDING_BYTES:
+-  capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++  capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+   break;
+   default:
+   capability->cap.valueInt = 0;

diff --git a/media-video/gpac/gpac-0.7.1.ebuild 
b/media-video/gpac/gpac-0.7.1.ebuild
index 2e7046a175c..ca4acbd586e 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.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
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}"
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc 
doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
"${FILESDIR}/${PN}-0.7.1-configure.patch"
+   "${FILESDIR}/ffmpeg4.patch"
 )
 
 DOCS=(

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2017-07-29 Thread Alexis Ballier

commit: 95783335d08d8148a2611fbed764216d24b7d375
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jul 28 08:29:30 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jul 29 10:05:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95783335

media-video/gpac: add subslot

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-video/gpac/gpac-0.7.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.7.1.ebuild 
b/media-video/gpac/gpac-0.7.1.ebuild
index a17425b4c9f..2e7046a175c 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -17,7 +17,8 @@ DESCRIPTION="Implementation of the MPEG-4 Systems standard 
developed from scratc
 HOMEPAGE="https://gpac.wp.imt.fr/;
 
 LICENSE="GPL-2"
-SLOT="0"
+# subslot == libgpac major
+SLOT="0/7"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2017-07-25 Thread Steve Dibb

commit: a78247bc9eb78753ac88a9c4d227f4e0f48930c8
Author: Steve Dibb  gentoo  org>
AuthorDate: Tue Jul 25 16:50:05 2017 +
Commit: Steve Dibb  gentoo  org>
CommitDate: Tue Jul 25 16:50:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78247bc

media-video/gpac: version bump

Drop old patches, new configure patch, bug 621004

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 media-video/gpac/Manifest |   1 +
 media-video/gpac/files/gpac-0.7.1-configure.patch |  94 +++
 media-video/gpac/gpac-0.7.1.ebuild| 136 ++
 3 files changed, 231 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 82a0e27b6df..02aa8d5998f 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
 DIST gpac-0.6.1.tar.gz 9113143 SHA256 
67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 
b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 WHIRLPOOL 
bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141
+DIST gpac-0.7.1.tar.gz 10654838 SHA256 
c7a18b9eea1264fee392e7222d16b180e0acdd6bb173ff6b8baadbf50b3b1d7f SHA512 
0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 WHIRLPOOL 
a82e6de4a48b29ca0b74eb206075302aa9db34cfa6681a1e98f22cfc88c43c5f0d0557ade6e770fe9b9f47756039fcb8ef42bd892ab08ef7a7e0fbbd4f239057

diff --git a/media-video/gpac/files/gpac-0.7.1-configure.patch 
b/media-video/gpac/files/gpac-0.7.1-configure.patch
new file mode 100644
index 000..8bc3ec9f907
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-configure.patch
@@ -0,0 +1,94 @@
+--- gpac-0.7.1/Makefile.orig   2017-07-25 09:34:51.910379115 -0600
 gpac-0.7.1/Makefile2017-07-25 09:36:18.906385736 -0600
+@@ -252,7 +252,9 @@
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
"$(DESTDIR)$(prefix)/include/gpac/enst"
+ endif
+   mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
++ifeq ($(STATIC_LIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" 
"$(DESTDIR)$(prefix)/$(libdir)"
++endif
+   $(MAKE) installdylib
+ 
+ uninstall-lib:
+--- gpac-0.7.1/src/Makefile.orig   2017-07-25 09:37:48.157392528 -0600
 gpac-0.7.1/src/Makefile2017-07-25 09:39:06.092398459 -0600
+@@ -267,16 +267,20 @@
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+ 
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)  $(LDFLAGS)
+ endif
+ 
+ else
+ 
++ifeq ($(STATICLIBS),yes)
+   $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) 
$(LDFLAGS)
+   mv $@ $@.$(VERSION_SONAME)
+--- gpac-0.7.1/configure.orig  2017-07-25 10:01:58.789502926 -0600
 gpac-0.7.1/configure   2017-07-25 10:02:54.110507136 -0600
+@@ -109,6 +109,7 @@
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -260,6 +261,7 @@
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  link statically against libgpac
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box only.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -705,15 +707,6 @@
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ fi
+ 
+-
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-CFLAGS="-O3 $CFLAGS"
+-else
+-CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+ want_pic="no"
+@@ -1885,6 +1878,8 @@
+ ;;
+ --enable-static-bin) static_build="yes";
+ ;;
++--enable-static-lib) static_libs="yes";
++;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-wx) has_wx="no"
+@@ -2559,6 +2554,7 @@
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Fixed-Point Version: $use_fixed_point"
+ echo "IPV6 Support: $has_ipv6"
+@@ -3194,6 +3190,7 @@
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then

diff --git

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2017-02-24 Thread Alexis Ballier

commit: 7609dc75c695e48c508cb5c13ac6afa88b384bb2
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Feb 24 08:59:27 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Feb 24 08:59:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7609dc75

media-video/gpac: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/gpac/Manifest  |   1 -
 media-video/gpac/files/ffmpeg25.patch  |  43 ---
 media-video/gpac/files/gpac-0.5.2-avpixfmt.patch   |  57 
 media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch   | 307 -
 .../gpac/files/gpac-0.5.2-static-libs.patch|  80 --
 media-video/gpac/gpac-0.5.2.ebuild | 120 
 media-video/gpac/gpac-0.6.1-r1.ebuild  | 119 
 7 files changed, 727 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index fed26a3dcd..82a0e27b6d 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.5.2.tar.gz 9044537 SHA256 
14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 
b682895c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
 WHIRLPOOL 
d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122
 DIST gpac-0.6.1.tar.gz 9113143 SHA256 
67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 
b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 WHIRLPOOL 
bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141

diff --git a/media-video/gpac/files/ffmpeg25.patch 
b/media-video/gpac/files/ffmpeg25.patch
deleted file mode 100644
index 5451b8e119..00
--- a/media-video/gpac/files/ffmpeg25.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add proper versionned checks for avformat_close_input
-https://bugs.gentoo.org/show_bug.cgi?id=536526
-
-diff --git a/modules/ffmpeg_in/ffmpeg_demux.c 
b/modules/ffmpeg_in/ffmpeg_demux.c
-index a5202ee..975a945 100644
 a/modules/ffmpeg_in/ffmpeg_demux.c
-+++ b/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -301,7 +301,7 @@ static Bool FFD_CanHandleURL(GF_InputService *plug, const 
char *url)
-   }
- 
- exit:
--#ifndef FF_API_CLOSE_INPUT_FILE
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-   if (ctx) av_close_input_file(ctx);
- #else
-   if (ctx) avformat_close_input();
-@@ -680,7 +680,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, 
GF_ClientService *serv,
- 
-   ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, 
AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
-   if (!ffd->seekable) {
--#ifndef FF_API_CLOSE_INPUT_FILE
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-   av_close_input_file(ffd->ctx);
- #else
-   avformat_close_input(>ctx);
-@@ -699,7 +699,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, 
GF_ClientService *serv,
- 
- err_exit:
-   GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file 
%s: %s\n", url, gf_error_to_string(e)));
--#ifndef FF_API_CLOSE_INPUT_FILE
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-   if (ffd->ctx) av_close_input_file(ffd->ctx);
- #else
-   if (ffd->ctx) avformat_close_input(>ctx);
-@@ -757,7 +757,7 @@ static GF_Err FFD_CloseService(GF_InputService *plug)
- 
-   ffd->is_running = 0;
- 
--#ifndef FF_API_CLOSE_INPUT_FILE
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-   if (ffd->ctx) av_close_input_file(ffd->ctx);
- #else
-   if (ffd->ctx) avformat_close_input(>ctx);

diff --git a/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch 
b/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch
deleted file mode 100644
index 0137a3ba64..00
--- a/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: gpac-0.5.2/applications/dashcast/video_encoder.c
-===
 gpac-0.5.2.orig/applications/dashcast/video_encoder.c
-+++ gpac-0.5.2/applications/dashcast/video_encoder.c
-@@ -86,7 +86,7 @@ int dc_video_encoder_open(VideoOutputFil
-   video_output_file->codec_ctx->time_base.den = 
video_data_conf->time_base.den;
-   video_output_file->codec_ctx->time_base.num = 
video_data_conf->time_base.num * video_data_conf->time_base.den / 
video_data_conf->framerate;
-   }
--  video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P;
-+  video_output_file->codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-   video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
- 
- //video_output_file->codec_ctx->codec_id = video_codec->id;
-@@ -96,7 +96,7 @@ int dc_video_encoder_open(VideoOutputFil
- //video_output_file->codec_ctx->height = video_data_conf->height;
- //

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2017-02-23 Thread Michael Weber

commit: e2e3c7a266e8eccc460fec74fd88479a6b664109
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Feb 23 23:27:20 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Feb 24 00:13:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e3c7a2

media-video/gpac: ppc64 stable (bug 607820).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/gpac/gpac-0.6.1-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
index ebfdae4d0c..f53a638975 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -7,10 +7,9 @@ EAPI=6
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS="alpha amd64 ppc sparc x86"
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+   KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2017-02-12 Thread Agostino Sarubbo

commit: 51782c2d913ee56df4a2c1da10f8fb2a9b22c235
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 12 16:57:51 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 12 17:00:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51782c2d

media-video/gpac: ppc stable wrt bug #607820

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/gpac/gpac-0.6.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
index c01ed8760e..25fd7172a3 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -7,10 +7,10 @@ EAPI=6
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS="alpha amd64 x86"
+   KEYWORDS="alpha amd64 ppc x86"
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+   KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2017-02-04 Thread Agostino Sarubbo

commit: 3ca8690423465ae5210f996f606113d6b5af1f35
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Feb  4 15:18:45 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Feb  4 15:21:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca86904

media-video/gpac: amd64 stable wrt bug #607820

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/gpac/gpac-0.6.1-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
index 8a92435..e750309 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.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$
 
@@ -7,10 +7,10 @@ EAPI=6
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS="alpha"
+   KEYWORDS="alpha amd64"
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+   KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2017-01-31 Thread Tobias Klausmann

commit: e6a3cd6dd60b809e1106119e606d15777f6a29ac
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jan 31 18:04:43 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jan 31 18:04:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a3cd6d

media-video/gpac-0.6.1-r2: stable on alpha

Gentoo-Bug: 607820

 media-video/gpac/gpac-0.6.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
index 69b7d95..8a92435 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -7,10 +7,10 @@ EAPI=6
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS=""
+   KEYWORDS="alpha"
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+   KEYWORDS="alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/

2017-01-04 Thread David Seifert

commit: fbf3e88e6e861a7af1da540a811cdfc82cad5b19
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Dec 30 14:27:54 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  4 10:13:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf3e88e

media-video/gpac: remove unused patches

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

 media-video/gpac/files/210_all_system_libogg.patch |  28 ---
 .../gpac/files/gpac-0.5.0-build-fixes.patch| 113 ---
 media-video/gpac/files/gpac-0.5.0-ffmpeg2.patch|  28 ---
 media-video/gpac/files/gpac-0.5.0-libav9.patch |  93 --
 media-video/gpac/files/gpac-0.5.0-mp42ts.patch |  17 --
 .../gpac/files/gpac-0.5.0-respect_ldflags.patch|  45 -
 .../gpac/files/gpac-0.5.1-build-fixes.patch| 206 -
 7 files changed, 530 deletions(-)

diff --git a/media-video/gpac/files/210_all_system_libogg.patch 
b/media-video/gpac/files/210_all_system_libogg.patch
deleted file mode 100644
index e09f57c..
--- a/media-video/gpac/files/210_all_system_libogg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
 src/Makefile.old   2012-07-15 15:34:54.0 +0200
-+++ src/Makefile   2012-07-15 15:39:51.0 +0200
-@@ -92,9 +92,6 @@
- ifeq ($(DISABLE_M2PS), no)
- LIBGPAC_MEDIATOOLS+=media_tools/mpeg2_ps.o
- endif
--ifeq ($(DISABLE_OGG), no)
--LIBGPAC_MEDIATOOLS+=media_tools/gpac_ogg.o
--endif
- ifeq ($(DISABLE_MCRYPT), no)
- LIBGPAC_MEDIATOOLS+=media_tools/ismacryp.o
- endif
-@@ -230,6 +227,15 @@
- endif
- endif
- 
-+#6 - OGG support
-+ifeq ($(CONFIG_OGG), no)
-+else
-+LINKLIBS+= -logg
-+ifeq ($(CONFIG_OGG), local)
-+NEED_LOCAL_LIB="yes"
-+MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/ogg"
-+endif
-+endif
- 
- ## libgpac compositor compilation options
- COMPOSITOR_CFLAGS=

diff --git a/media-video/gpac/files/gpac-0.5.0-build-fixes.patch 
b/media-video/gpac/files/gpac-0.5.0-build-fixes.patch
deleted file mode 100644
index 741fd28..
--- a/media-video/gpac/files/gpac-0.5.0-build-fixes.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -ur gpac/configure gpac.new/configure
 gpac/configure 2012-05-25 08:05:57.0 -0400
-+++ gpac.new/configure 2012-10-04 13:59:58.0 -0400
-@@ -103,6 +103,7 @@
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- has_joystick="no"
- has_xul="no"
-@@ -221,6 +222,7 @@
-   --disable-platinum   disable Platinum UPnP support
-   --disable-alsa   disable Alsa audio
-   --disable-oss-audio  disable OSS audio
-+  --disable-sdldisable SDL support
-   --enable-jackenable  Jack audio
-   --disable-jack   disable Jack audio
-   --enable-pulseaudio  enable  Pulse audio
-@@ -236,6 +238,7 @@
-   --enable-amr-wb  enable AMR WB library
-   --enable-amr enable both AMR NB and WB libraries
-   --enable-static-bin  GPAC static build
-+  --enable-static-lib  GPAC static libraries build
-   --static-mp4box  configure for static linking of MP4Box.
-   --enable-depth   enables depth handling in the compositor
- 
-@@ -1607,6 +1610,8 @@
- ;;
- --enable-static-bin) static_build="yes";
- ;;
-+--enable-static-lib) static_libs="yes";
-+;;
- --disable-ipv6) has_ipv6="no"
- ;;
- --disable-wx) has_wx="no"
-@@ -1615,6 +1620,8 @@
- ;;
- --disable-oss-audio) has_oss_audio="no"
- ;;
-+--disable-sdl) has_sdl="no"
-+;;
- --disable-x11-shm) has_x11_shm="no"
- ;;
- --disable-x11-xv) has_x11_xv="no"
-@@ -2157,6 +2164,7 @@
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs build enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Use standard memory allocator: $use_std_alloc"
- echo "fixed-point version: $use_fixed_point"
-@@ -2700,6 +2708,7 @@
- echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-@@ -2893,8 +2893,6 @@
- mkdir ./bin/gcc/temp
- fi
- 
--echo '%.opic : %.c' >> config.mak
--echo '$(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak
- 
- #pkg-config
- echo "prefix=$prefix"  > gpac.pc
-diff -ur gpac/Makefile gpac.new/Makefile
 gpac/Makefile  2012-05-25 08:05:57.0 -0400
-+++ gpac.new/Makefile  2012-10-04 14:05:08.0 -0400
-@@ -119,9 +119,6 @@
-   $(INSTALL) $(INSTFLAGS) -m 755 
bin/gcc/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) 
$(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
-   ln -sf

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-10-09 Thread Pacho Ramos

commit: 2a3925acc860800554fb728f61c4a4c26f9b2b50
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  9 16:16:30 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  9 16:19:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3925ac

media-video/gpac: Make repoman more happy

Package-Manager: portage-2.3.1

 media-video/gpac/gpac-0.6.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
index e491178..69b7d95 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -15,7 +15,7 @@ fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
 
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard 
developed from scratch in ANSI C"
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from 
scratch in ANSI C"
 HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-10-09 Thread Pacho Ramos

commit: 4367765bc4813a9ac15e68fbd9439a4dd104f750
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  9 16:13:28 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  9 16:19:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4367765b

media-video/gpac: Support libressl (#592712)

Package-Manager: portage-2.3.1

 media-video/gpac/gpac-0.6.1-r2.ebuild | 124 ++
 1 file changed, 124 insertions(+)

diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild 
b/media-video/gpac/gpac-0.6.1-r2.ebuild
new file mode 100644
index ..e491178
--- /dev/null
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == * ]] ; then
+   SCM="git-r3"
+   EGIT_REPO_URI="https://github.com/gpac/gpac;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard 
developed from scratch in ANSI C"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad 
opengl oss png
+   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+RDEPEND="
+   a52? ( media-libs/a52dec )
+   aac? ( >=media-libs/faad2-2.0 )
+   alsa? ( media-libs/alsa-lib )
+   dvb? ( media-tv/linuxtv-dvb-apps )
+   ffmpeg? (
+   !libav? ( media-video/ffmpeg:0= )
+   libav? ( media-video/libav:0= ) )
+   jack? ( media-sound/jack-audio-connection-kit )
+   jpeg? ( virtual/jpeg:0 )
+   mad? ( >=media-libs/libmad-0.15.1b )
+   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+   >=media-libs/libogg-1.1
+   png? ( >=media-libs/libpng-1.4:0= )
+   vorbis? ( >=media-libs/libvorbis-1.1 )
+   theora? ( media-libs/libtheora )
+   truetype? ( >=media-libs/freetype-2.1.4:2 )
+   xml? ( >=dev-libs/libxml2-2.6.0:2 )
+   xvid? ( >=media-libs/xvid-1.0.1 )
+   sdl? ( media-libs/libsdl )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= ) )
+   pulseaudio? ( media-sound/pulseaudio )
+   X? (
+   x11-libs/libXt
+   x11-libs/libX11
+   x11-libs/libXv
+   x11-libs/libXext
+   )
+"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}"
+
+my_use() {
+   local flag="$1" pflag="${2:-$1}"
+   if use ${flag}; then
+   echo "--use-${pflag}=system"
+   else
+   echo "--use-${pflag}=no"
+   fi
+}
+
+src_prepare() {
+   default
+   eapply  "${FILESDIR}"/110_all_implicitdecls.patch \
+   "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
+   "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+   sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+   tc-export CC CXX AR RANLIB
+
+   econf \
+   --enable-svg \
+   --enable-pic \
+   --disable-amr \
+   --use-js=no \
+   --use-ogg=system \
+   $(use_enable alsa) \
+   $(use_enable debug) \
+   $(use_enable ipv6) \
+   $(use_enable jack jack yes) \
+   $(use_enable opengl 3d) \
+   $(use_enable oss oss-audio) \
+   $(use_enable pulseaudio pulseaudio yes) \
+   $(use_enable sdl) \
+   $(use_enable ssl) \
+   $(use_enable static-libs static-lib) \
+   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
+   --disable-wx \
+   $(my_use a52) \
+   $(my_use aac faad) \
+   $(my_use dvb dvbx) \
+   $(my_use ffmpeg) \
+   $(my_use jpeg) \
+   $(my_use jpeg2k openjpeg) \
+   $(my_use mad) \
+   $(my_use png) \
+   $(my_use theora) \
+   $(my_use truetype ft) \
+   $(my_use vorbis) \
+   $(my_use xvid) \
+   --extra-cflags="${CFLAGS}" \
+   --cc="$(tc-getCC)" \
+   --libdir="/$(get_libdir)" \
+   --verbose
+}
+
+src_install() {
+   emake STRIP="true" DESTDIR="${D}" install
+   emake STRIP="true" DESTDIR="${D}" install-lib
+   dodoc AUTHORS BUGS Changelog README.md TODO
+   dodoc doc/*.txt
+   dohtml doc/*.html
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-10-09 Thread Pacho Ramos

commit: d803f7ebd7f8d92ac3e6680a4257cb2cc5471a8c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  9 16:11:50 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  9 16:19:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d803f7eb

media-video/gpac: Drop old

Package-Manager: portage-2.3.1

 media-video/gpac/Manifest  |   2 -
 media-video/gpac/gpac-0.5.0-r1.ebuild  | 129 -
 media-video/gpac/gpac-0.5.1_pre5456.ebuild | 120 ---
 3 files changed, 251 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 9651e11..fed26a3 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,4 +1,2 @@
-DIST gpac-0.5.0.tar.gz 7861057 SHA256 
42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 
dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278
 WHIRLPOOL 
1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
-DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 
81746ad1d9a8ae0a84c73652d1af5d86d9c36229b278422c13e353893893a83c SHA512 
25883e32d83dc2b4649c506b86f745d2f8e75fff629b534205979aeb519a167243e62ec0d78e453d1edc27435acffd521a8c08a739cde05196f61e93ac47
 WHIRLPOOL 
af5a89cb52802bc45edd29c6f0f5ce9f48decea16eef8a76c33c7161a6d48b3d43f1a2b4c3049d2f1f92d0c3f22b787a33c1652f42d2c0cf3b84ad58c2fb7589
 DIST gpac-0.5.2.tar.gz 9044537 SHA256 
14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 
b682895c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
 WHIRLPOOL 
d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122
 DIST gpac-0.6.1.tar.gz 9113143 SHA256 
67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 
b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 WHIRLPOOL 
bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141

diff --git a/media-video/gpac/gpac-0.5.0-r1.ebuild 
b/media-video/gpac/gpac-0.5.0-r1.ebuild
deleted file mode 100644
index 9ddbb42..
--- a/media-video/gpac/gpac-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard 
developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid"
-
-S="${WORKDIR}"/${PN}
-
-RDEPEND="
-   a52? ( media-libs/a52dec )
-   aac? ( >=media-libs/faad2-2.0 )
-   alsa? ( media-libs/alsa-lib )
-   dvb? ( media-tv/linuxtv-dvb-apps )
-   ffmpeg? ( virtual/ffmpeg )
-   jack? ( media-sound/jack-audio-connection-kit )
-   jpeg? ( virtual/jpeg )
-   mad? ( >=media-libs/libmad-0.15.1b )
-   opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-   >=media-libs/libogg-1.1
-   png? ( >=media-libs/libpng-1.4 )
-   vorbis? ( >=media-libs/libvorbis-1.1 )
-   theora? ( media-libs/libtheora )
-   truetype? ( >=media-libs/freetype-2.1.4 )
-   xml? ( >=dev-libs/libxml2-2.6.0 )
-   xvid? ( >=media-libs/xvid-1.0.1 )
-   sdl? ( media-libs/libsdl )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   ssl? ( dev-libs/openssl )
-   pulseaudio? ( media-sound/pulseaudio )
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-
-DEPEND="${RDEPEND}"
-
-my_use() {
-   local flag="$1" pflag="${2:-$1}"
-   if use ${flag}; then
-   echo "--use-${pflag}=system"
-   else
-   echo "--use-${pflag}=no"
-   fi
-}
-
-src_prepare() {
-   epatch  "${FILESDIR}"/110_all_implicitdecls.patch \
-   "${FILESDIR}"/210_all_system_libogg.patch \
-   "${FILESDIR}"/${P}-build-fixes.patch \
-   "${FILESDIR}"/${P}-libav9.patch \
-   "${FILESDIR}"/${P}-ffmpeg2.patch \
-   "${FILESDIR}"/${P}-mp42ts.patch \
-   "${FILESDIR}"/${P}-respect_ldflags.patch
-
-   # remove last of internal ogg
-   sed -i \
-   -e 's:::' \
-   
src/media_tools/{av_parsers,gpac_ogg,media_import,media_export}.c ||

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-09-15 Thread Alexis Ballier

commit: b7ccd24ebee79e5f75e7a1174bda94fd6402
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Sep 15 16:32:03 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Sep 15 16:32:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ccd24e

media-video/gpac: fix automagic on libgl

Package-Manager: portage-2.3.0

 media-video/gpac/{gpac-0.6.1.ebuild => gpac-0.6.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.6.1.ebuild 
b/media-video/gpac/gpac-0.6.1-r1.ebuild
similarity index 97%
rename from media-video/gpac/gpac-0.6.1.ebuild
rename to media-video/gpac/gpac-0.6.1-r1.ebuild
index 55f59ff..566713a 100644
--- a/media-video/gpac/gpac-0.6.1.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -84,7 +84,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable ipv6) \
$(use_enable jack jack yes) \
-   $(use_enable opengl) \
+   $(use_enable opengl 3d) \
$(use_enable oss oss-audio) \
$(use_enable pulseaudio pulseaudio yes) \
$(use_enable sdl) \

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-05-26 Thread Tobias Klausmann

commit: 8f0819fd59e045c2576340dd053052c2b0c60308
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu May 26 11:41:11 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu May 26 11:42:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0819fd

media-video/gpac-0.5.2-r0: add alpha keyword

Gentoo-Bug: 575308

Package-Manager: portage-2.3.0_rc1

 media-video/gpac/gpac-0.5.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/gpac/gpac-0.5.2.ebuild 
b/media-video/gpac/gpac-0.5.2.ebuild
index 0f6f6b0..31467af 100644
--- a/media-video/gpac/gpac-0.5.2.ebuild
+++ b/media-video/gpac/gpac-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,10 +7,10 @@ EAPI=4
 if [[ ${PV} == * ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac;
-   KEYWORDS=""
+   KEYWORDS="alpha"
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+   KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-03-19 Thread Alexis Ballier

commit: 6200d2292187e65e52bc75295d956e04150f9ca1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Mar 16 15:47:56 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Mar 16 18:25:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6200d229

media-video/gpac: bump to 0.6.1 and add X useflag

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/gpac/Manifest|  1 +
 media-video/gpac/{gpac-.ebuild => gpac-0.6.1.ebuild} | 14 +-
 media-video/gpac/gpac-.ebuild| 14 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index dd66f6e..9651e11 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,3 +1,4 @@
 DIST gpac-0.5.0.tar.gz 7861057 SHA256 
42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 
dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278
 WHIRLPOOL 
1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
 DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 
81746ad1d9a8ae0a84c73652d1af5d86d9c36229b278422c13e353893893a83c SHA512 
25883e32d83dc2b4649c506b86f745d2f8e75fff629b534205979aeb519a167243e62ec0d78e453d1edc27435acffd521a8c08a739cde05196f61e93ac47
 WHIRLPOOL 
af5a89cb52802bc45edd29c6f0f5ce9f48decea16eef8a76c33c7161a6d48b3d43f1a2b4c3049d2f1f92d0c3f22b787a33c1652f42d2c0cf3b84ad58c2fb7589
 DIST gpac-0.5.2.tar.gz 9044537 SHA256 
14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 
b682895c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
 WHIRLPOOL 
d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122
+DIST gpac-0.6.1.tar.gz 9113143 SHA256 
67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 
b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 WHIRLPOOL 
bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-0.6.1.ebuild
similarity index 92%
copy from media-video/gpac/gpac-.ebuild
copy to media-video/gpac/gpac-0.6.1.ebuild
index fb000a1..55f59ff 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-0.6.1.ebuild
@@ -20,7 +20,8 @@ HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
a52? ( media-libs/a52dec )
@@ -43,10 +44,12 @@ RDEPEND="
jpeg2k? ( media-libs/openjpeg:0 )
ssl? ( dev-libs/openssl )
pulseaudio? ( media-sound/pulseaudio )
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext"
+   X? (
+   x11-libs/libXt
+   x11-libs/libX11
+   x11-libs/libXv
+   x11-libs/libXext
+   )"
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
 
@@ -87,6 +90,7 @@ src_configure() {
$(use_enable sdl) \
$(use_enable ssl) \
$(use_enable static-libs static-lib) \
+   $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X 
x11-xv) \
--disable-wx \
$(my_use a52) \
$(my_use aac faad) \

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index fb000a1..55f59ff 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -20,7 +20,8 @@ HOMEPAGE="http://gpac.wp.mines-telecom.fr/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+   pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
a52? ( media-libs/a52dec )
@@ -43,10 +44,12 @@ RDEPEND="
jpeg2k? ( media-libs/openjpeg:0 )
ssl? ( dev-libs/openssl )
pulseaudio? ( media-sound/pulseaudio )
-   x11-libs/libXt
-   x11-libs/libX11
-   x11-libs/libXv
-   x11-libs/libXext"
+   X? (
+   x11-libs/libXt
+   x11-libs/libX11
+   x11-libs/libXv
+

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2016-03-14 Thread Agostino Sarubbo

commit: 5249680c51c293bae5efb7157efe3b737bc3a56b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 14 22:11:09 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 14 22:11:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5249680c

media-video/gpac: amd64 stable wrt bug #575308

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/gpac/gpac-0.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gpac/gpac-0.5.2.ebuild 
b/media-video/gpac/gpac-0.5.2.ebuild
index 04a7f8e..0567372 100644
--- a/media-video/gpac/gpac-0.5.2.ebuild
+++ b/media-video/gpac/gpac-0.5.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
KEYWORDS=""
 else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+   KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2015-09-16 Thread Alexis Ballier

commit: a2a7ab8426921d89601e1d73746e83dcc2f511a7
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep 16 11:47:18 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep 16 11:47:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a7ab84

media-video/gpac: fix build with ffmpeg git master.

Package-Manager: portage-2.2.20.1

 media-video/gpac/files/gpac-0.5.2-avpixfmt.patch |  57 +
 media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch | 307 +++
 media-video/gpac/gpac-0.5.2.ebuild   |   7 +-
 3 files changed, 370 insertions(+), 1 deletion(-)

diff --git a/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch 
b/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch
new file mode 100644
index 000..0137a3b
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch
@@ -0,0 +1,57 @@
+Index: gpac-0.5.2/applications/dashcast/video_encoder.c
+===
+--- gpac-0.5.2.orig/applications/dashcast/video_encoder.c
 gpac-0.5.2/applications/dashcast/video_encoder.c
+@@ -86,7 +86,7 @@ int dc_video_encoder_open(VideoOutputFil
+   video_output_file->codec_ctx->time_base.den = 
video_data_conf->time_base.den;
+   video_output_file->codec_ctx->time_base.num = 
video_data_conf->time_base.num * video_data_conf->time_base.den / 
video_data_conf->framerate;
+   }
+-  video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P;
++  video_output_file->codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+   video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
+ 
+ //video_output_file->codec_ctx->codec_id = video_codec->id;
+@@ -96,7 +96,7 @@ int dc_video_encoder_open(VideoOutputFil
+ //video_output_file->codec_ctx->height = video_data_conf->height;
+ //video_output_file->codec_ctx->time_base = (AVRational) {1 ,
+ //video_output_file->video_data_conf->framerate};
+-//video_output_file->codec_ctx->codec->pix_fmt = PIX_FMT_YUV420P;
++//video_output_file->codec_ctx->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+   video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
+ //
+ //av_opt_set(video_output_file->codec_ctx->priv_data, "preset", 
"ultrafast", 0);
+Index: gpac-0.5.2/applications/dashcast/video_muxer.c
+===
+--- gpac-0.5.2.orig/applications/dashcast/video_muxer.c
 gpac-0.5.2/applications/dashcast/video_muxer.c
+@@ -643,7 +643,7 @@ int dc_ffmpeg_video_muxer_open(VideoOutp
+ 
+   video_stream->codec->time_base = video_codec_ctx->time_base;
+ 
+-  video_stream->codec->pix_fmt = PIX_FMT_YUV420P;
++  video_stream->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+   video_stream->codec->gop_size = video_codec_ctx->time_base.den; 
//video_output_file->video_data_conf->framerate;
+ 
+   av_opt_set(video_stream->codec->priv_data, "preset", "ultrafast", 0);
+Index: gpac-0.5.2/applications/dashcast/video_scaler.c
+===
+--- gpac-0.5.2.orig/applications/dashcast/video_scaler.c
 gpac-0.5.2/applications/dashcast/video_scaler.c
+@@ -125,7 +125,7 @@ int dc_video_scaler_data_init(VideoInput
+   dc_consumer_init(_scaled_data->consumer, video_cb_size, name);
+ 
+   video_scaled_data->num_producers = max_source;
+-  video_scaled_data->out_pix_fmt = PIX_FMT_YUV420P;
++  video_scaled_data->out_pix_fmt = AV_PIX_FMT_YUV420P;
+   GF_SAFE_ALLOC_N(video_scaled_data->vsprop, max_source, VideoScaledProp);
+   memset(video_scaled_data->vsprop, 0, max_source * 
sizeof(VideoScaledProp));
+ 
+@@ -198,7 +198,7 @@ int dc_video_scaler_scale(VideoInputData
+   video_scaled_data_node->cropped_frame->width  = 
video_input_data->vprop[index].width  - video_input_data->vprop[index].crop_x;
+   video_scaled_data_node->cropped_frame->height = 
video_input_data->vprop[index].height - video_input_data->vprop[index].crop_y;
+ #endif
+-  if 
(av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, 
(AVPicture*)video_data_node->vframe, PIX_FMT_YUV420P, 
video_input_data->vprop[index].crop_y, video_input_data->vprop[index].crop_x) < 
0) {
++  if 
(av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, 
(AVPicture*)video_data_node->vframe, AV_PIX_FMT_YUV420P, 
video_input_data->vprop[index].crop_y, video_input_data->vprop[index].crop_x) < 
0) {
+   GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error 
while cropping picture.\n"));
+   return -1;
+   }

diff --git a/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch 
b/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch
new file mode 100644
index 000..1cf5487
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch
@@ -0,0 +1,307 @@
+Index:

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2015-08-22 Thread Alexis Ballier

commit: 7572631c02d9cd344896f44e5d3999cc5c58668d
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:16:58 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:16:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7572631c

media-video/gpac-: update to use github instead of sf.net

Package-Manager: portage-2.2.20.1

 ...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 
 .../gpac/files/gpac-0.5.2-static-libs.patch| 85 ++
 media-video/gpac/gpac-.ebuild  | 16 ++--
 3 files changed, 109 insertions(+), 7 deletions(-)

diff --git 
a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 
b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
new file mode 100644
index 000..df3a5fc
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
@@ -0,0 +1,15 @@
+Export gf_isom_set_pixel_aspect_ratio.
+media-video/x264-encoder needs it and this funcion used to be exported.
+
+diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
+index e935acc..9841d85 100644
+--- a/src/isomedia/isom_write.c
 b/src/isomedia/isom_write.c
+@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 
trackNumber, u32 StreamDes
+   }
+ }
+ 
++GF_EXPORT
+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 
StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
+ {
+   GF_Err e;

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
new file mode 100644
index 000..ec11eae
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile b/Makefile
+index 62b7850..ff4b589 100644
+--- a/Makefile
 b/Makefile
+@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
$(DESTDIR)$(prefix)/include/gpac/enst
+ endif
+   mkdir -p $(DESTDIR)$(prefix)/$(libdir)
++ifeq ($(STATICLIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 ./bin/gcc/libgpac_static.a 
$(DESTDIR)$(prefix)/$(libdir)
++endif
+   $(MAKE) installdylib
+ 
+ uninstall-lib:
+diff --git a/configure b/configure
+index df00dff..561bcd3 100755
+--- a/configure
 b/configure
+@@ -101,6 +101,7 @@ has_xmlrpc=no
+ has_openjpeg=no
+ gprof_build=no
+ static_build=no
++static_libs=no
+ want_pic=no
+ want_gcov=no
+ has_joystick=no
+@@ -252,6 +253,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  link statically against libgpac
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box only.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -1849,6 +1851,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build=yes;
+ ;;
++--enable-static-lib) static_libs=yes;
++;;
+ --disable-ipv6) has_ipv6=no
+ ;;
+ --disable-wx) has_wx=no
+@@ -2525,6 +2529,7 @@ echo ** GPAC $version rev$revision Core Configuration 
**
+ echo debug version: $debuginfo
+ echo GProf enabled: $gprof_build
+ echo Static build enabled: $static_build
++echo Static libs build enabled: $static_libs
+ echo Memory tracking enabled: $use_memory_tracking
+ echo Fixed-Point Version: $use_fixed_point
+ echo IPV6 Support: $has_ipv6
+@@ -3133,6 +3138,7 @@ echo DEBUGBUILD=$debuginfo  config.mak
+ echo GPROFBUILD=$gprof_build  config.mak
+ echo MP4BOX_STATIC=$static_mp4box  config.mak
+ echo STATICBUILD=$static_build  config.mak
++echo STATICLIBS=$static_libs  config.mak
+ 
+ echo CONFIG_IPV6=$has_ipv6  config.mak
+ if test $has_ipv6 = yes ; then
+diff --git a/src/Makefile b/src/Makefile
+index ba9d9ab..89ea67f 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
+   @echo LIBS $(EXTRALIBS)
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+ endif
+ 
+ else
+ 
++ifeq ($(STATICLIBS),yes)
+   $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+   mv $@ $@.$(VERSION_SONAME)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index d2209c4..ab5603b 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -5,12 +5,13 @@
 EAPI=4
 
 if [[ ${PV} == * ]] ; then
-

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2015-08-22 Thread Alexis Ballier

commit: 4e6cd1f8a40eb2ba48f346901fb92834b0a1de8e
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:27:41 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:27:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6cd1f8

media-video/gpac: fix ebuild.minorsyn

Package-Manager: portage-2.2.20.1

 media-video/gpac/gpac-0.5.2.ebuild | 1 -
 media-video/gpac/gpac-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.5.2.ebuild 
b/media-video/gpac/gpac-0.5.2.ebuild
index 19d06af..14c43be 100644
--- a/media-video/gpac/gpac-0.5.2.ebuild
+++ b/media-video/gpac/gpac-0.5.2.ebuild
@@ -22,7 +22,6 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid
 
-
 RDEPEND=
a52? ( media-libs/a52dec )
aac? ( =media-libs/faad2-2.0 )

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 2c15ff5..fb000a1 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -22,7 +22,6 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid
 
-
 RDEPEND=
a52? ( media-libs/a52dec )
aac? ( =media-libs/faad2-2.0 )

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2015-08-22 Thread Alexis Ballier

commit: c6e6f0001f670de9b9fc20d2b17fa051ed725b0a
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:26:43 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:26:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e6f000

media-video/gpac: bump to 0.5.2

Package-Manager: portage-2.2.20.1

 media-video/gpac/Manifest  |   1 +
 .../gpac/files/gpac-0.5.2-static-libs.patch|  80 ++
 media-video/gpac/gpac-0.5.2.ebuild | 116 +
 3 files changed, 197 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index f16d0af..dd66f6e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,3 @@
 DIST gpac-0.5.0.tar.gz 7861057 SHA256 
42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 
dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278
 WHIRLPOOL 
1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
 DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 
81746ad1d9a8ae0a84c73652d1af5d86d9c36229b278422c13e353893893a83c SHA512 
25883e32d83dc2b4649c506b86f745d2f8e75fff629b534205979aeb519a167243e62ec0d78e453d1edc27435acffd521a8c08a739cde05196f61e93ac47
 WHIRLPOOL 
af5a89cb52802bc45edd29c6f0f5ce9f48decea16eef8a76c33c7161a6d48b3d43f1a2b4c3049d2f1f92d0c3f22b787a33c1652f42d2c0cf3b84ad58c2fb7589
+DIST gpac-0.5.2.tar.gz 9044537 SHA256 
14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 
b682895c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
 WHIRLPOOL 
d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
new file mode 100644
index 000..91c89c4
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,80 @@
+Index: gpac-0.5.2/configure
+===
+--- gpac-0.5.2.orig/configure
 gpac-0.5.2/configure
+@@ -101,6 +101,7 @@ has_xmlrpc=no
+ has_openjpeg=no
+ gprof_build=no
+ static_build=no
++static_libs=no
+ want_pic=no
+ want_gcov=no
+ has_joystick=no
+@@ -248,6 +249,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  GPAC static build
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -1775,6 +1777,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build=yes;
+ ;;
++  --enable-static-lib) static_libs=yes;
++ ;;
+ --disable-ipv6) has_ipv6=no
+ ;;
+ --disable-wx) has_wx=no
+@@ -2452,6 +2456,7 @@ echo ** GPAC $version rev$revision Core
+ echo debug version: $debuginfo
+ echo GProf enabled: $gprof_build
+ echo Static build enabled: $static_build
++echo Static libs build enabled: $static_libs
+ echo Memory tracking enabled: $use_memory_tracking
+ echo Use standard memory allocator: $use_std_alloc
+ echo Fixed-Point Version: $use_fixed_point
+@@ -3064,6 +3069,7 @@ echo CONFIG_AMR_WB_FT=$has_amr_wb  c
+ echo DEBUGBUILD=$debuginfo  config.mak
+ echo GPROFBUILD=$gprof_build  config.mak
+ echo STATICBUILD=$static_build  config.mak
++echo STATICLIBS=$static_libs  config.mak
+ 
+ echo CONFIG_IPV6=$has_ipv6  config.mak
+ if test $has_ipv6 = yes ; then
+Index: gpac-0.5.2/Makefile
+===
+--- gpac-0.5.2.orig/Makefile
 gpac-0.5.2/Makefile
+@@ -203,7 +203,9 @@ ifeq ($(GPAC_ENST), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
$(DESTDIR)$(prefix)/include/gpac/enst
+ endif
+   mkdir -p $(DESTDIR)$(prefix)/$(libdir)
++ifeq ($(STATICLIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 ./bin/gcc/libgpac_static.a 
$(DESTDIR)$(prefix)/$(libdir)
++endif
+   $(MAKE) installdylib
+ 
+ uninstall-lib:
+Index: gpac-0.5.2/src/Makefile
+===
+--- gpac-0.5.2.orig/src/Makefile
 gpac-0.5.2/src/Makefile
+@@ -606,12 +606,16 @@ compositor: $(LIBGPAC_COMPOSITOR)
+   @echo OBJS $(OBJS)
+   @echo LIBS $(EXTRALIBS)
+ ifeq ($(CONFIG_DARWIN),yes)
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+ else
++ifeq

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2015-08-22 Thread Alexis Ballier

commit: 2d3805f9c45c2803e5b6b78b4210e409384785fb
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:20:14 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:20:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3805f9

media-video/gpac-: minor updates.

Rename patch to ...-0.5.3-... as it does not apply to 0.5.2.
Do not override S for releases.

Package-Manager: portage-2.2.20.1

 .../{gpac-0.5.2-static-libs.patch = gpac-0.5.3-static-libs.patch} | 0
 media-video/gpac/gpac-.ebuild  | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
similarity index 100%
rename from media-video/gpac/files/gpac-0.5.2-static-libs.patch
rename to media-video/gpac/files/gpac-0.5.3-static-libs.patch

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index ab5603b..2c15ff5 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -11,7 +11,6 @@ if [[ ${PV} == * ]] ; then
 else
SRC_URI=https://github.com/gpac/gpac/archive/v${PV}.tar.gz - 
${P}.tar.gz
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-   S=${WORKDIR}/${PN}
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -65,7 +64,7 @@ my_use() {
 
 src_prepare() {
epatch  ${FILESDIR}/110_all_implicitdecls.patch \
-   ${FILESDIR}/${PN}-0.5.2-static-libs.patch \
+   ${FILESDIR}/${PN}-0.5.3-static-libs.patch \

${FILESDIR}/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
sed -i -e s:\(--disable-.*\)=\*):\1): configure || die
 }

83 matches

Mail list logo