From c32af12a0308aa3e7cda2258acef74d81b0de57d Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 8 Sep 2020 23:36:17 +0100 Subject: media-video/gpac: rename zlib patch Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Sam James --- .../gpac/files/gpac-1.0.0-zlib-compile.patch | 33 ++++++++++++++++++++++ media-video/gpac/files/zlib.patch | 33 ---------------------- media-video/gpac/gpac-1.0.0.ebuild | 2 +- media-video/gpac/gpac-9999.ebuild | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 media-video/gpac/files/gpac-1.0.0-zlib-compile.patch delete mode 100644 media-video/gpac/files/zlib.patch (limited to 'media-video') diff --git a/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch b/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch new file mode 100644 index 000000000000..c5b1fc4ab56f --- /dev/null +++ b/media-video/gpac/files/gpac-1.0.0-zlib-compile.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/files/zlib.patch b/media-video/gpac/files/zlib.patch deleted file mode 100644 index c5b1fc4ab56f..000000000000 --- a/media-video/gpac/files/zlib.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 index 6a8fe8c576ae..7721c668112c 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-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index 1fcbfe48c821..eb3754e022a1 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.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=( -- cgit v1.2.3-65-gdbad