From 1d8ec424bccc9f21f88062ca9df4498f09dccf58 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 4 Sep 2020 18:13:19 +0200 Subject: media-video/gpac: bump to 1.0.0 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Alexis Ballier --- media-video/gpac/Manifest | 1 + media-video/gpac/files/zlib.patch | 33 +++++++++ media-video/gpac/gpac-1.0.0.ebuild | 138 +++++++++++++++++++++++++++++++++++++ media-video/gpac/gpac-9999.ebuild | 22 +++--- 4 files changed, 180 insertions(+), 14 deletions(-) create mode 100644 media-video/gpac/files/zlib.patch create mode 100644 media-video/gpac/gpac-1.0.0.ebuild diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index fa53da9d266e..261a41794a29 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 10289999 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 000000000000..c5b1fc4ab56f --- /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_flush OF((gzFile file, int flush)); + //local int get_byte OF((gz_stream *s)); +-local void check_header OF((gz_stream *s)); +-local int destroy OF((gz_stream *s)); ++local void check_header _Z_OF((gz_stream *s)); ++local int destroy _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_error OF((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-1.0.0.ebuild b/media-video/gpac/gpac-1.0.0.ebuild new file mode 100644 index 000000000000..37ed1edce4a6 --- /dev/null +++ b/media-video/gpac/gpac-1.0.0.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == *9999 ]] ; 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" + +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: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 ) + 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} + virtual/pkgconfig + dvb? ( sys-kernel/linux-headers ) +" + +PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.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) + $(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() { + einstalldocs + emake STRIP="true" DESTDIR="${D}" install + emake STRIP="true" DESTDIR="${D}" install-lib +} diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index 5c4fcbaddd14..37ed1edce4a6 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.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 --use-js=no --use-ogg=system $(use_enable alsa) -- cgit v1.2.3-65-gdbad