commit: 1d8ec424bccc9f21f88062ca9df4498f09dccf58
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 16:13:19 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 16:47:13 2020 +0000
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 <aballier <AT> gentoo.org>
media-video/gpac/Manifest | 1 +
media-video/gpac/files/zlib.patch | 33 ++++++++++++++++++++++
.../gpac/{gpac-9999.ebuild => gpac-1.0.0.ebuild} | 22 ++++++---------
media-video/gpac/gpac-9999.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 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 00000000000..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_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-9999.ebuild
b/media-video/gpac/gpac-1.0.0.ebuild
similarity index 89%
copy from media-video/gpac/gpac-9999.ebuild
copy to media-video/gpac/gpac-1.0.0.ebuild
index 5c4fcbaddd1..37ed1edce4a 100644
--- a/media-video/gpac/gpac-9999.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
--use-js=no
--use-ogg=system
$(use_enable alsa)
diff --git a/media-video/gpac/gpac-9999.ebuild
b/media-video/gpac/gpac-9999.ebuild
index 5c4fcbaddd1..37ed1edce4a 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)
