Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
Date: Fri, 04 Sep 2020 16:47:21
Message-Id: 1599238033.1d8ec424bccc9f21f88062ca9df4498f09dccf58.aballier@gentoo
1 commit: 1d8ec424bccc9f21f88062ca9df4498f09dccf58
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 4 16:13:19 2020 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 16:47:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8ec424
7
8 media-video/gpac: bump to 1.0.0
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 media-video/gpac/Manifest | 1 +
14 media-video/gpac/files/zlib.patch | 33 ++++++++++++++++++++++
15 .../gpac/{gpac-9999.ebuild => gpac-1.0.0.ebuild} | 22 ++++++---------
16 media-video/gpac/gpac-9999.ebuild | 22 ++++++---------
17 4 files changed, 50 insertions(+), 28 deletions(-)
18
19 diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
20 index fa53da9d266..261a41794a2 100644
21 --- a/media-video/gpac/Manifest
22 +++ b/media-video/gpac/Manifest
23 @@ -1 +1,2 @@
24 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
25 +DIST gpac-1.0.0.tar.gz 10289999 BLAKE2B 9bd1134a53c59fae59bb18a2e4f8c5db0639fbbc7e2270a16d8a621c3cb37529c7bdf536b0ac71227579b3b6c09305960775f6676a1f4d0f15b3cf3ae99b91ef SHA512 930b4b02f1d68554a99b9fde3faf6a429d78a86522b52da7601a40907d41e159724c935952becc008ae626001cb23543e446125dfb58764513d5808197ec4e29
26
27 diff --git a/media-video/gpac/files/zlib.patch b/media-video/gpac/files/zlib.patch
28 new file mode 100644
29 index 00000000000..c5b1fc4ab56
30 --- /dev/null
31 +++ b/media-video/gpac/files/zlib.patch
32 @@ -0,0 +1,33 @@
33 +Index: gpac-1.0.0/src/utils/gzio.c
34 +===================================================================
35 +--- gpac-1.0.0.orig/src/utils/gzio.c
36 ++++ gpac-1.0.0/src/utils/gzio.c
37 +@@ -93,10 +93,10 @@ typedef struct gz_stream {
38 + //local gzFile gz_open OF((const char *path, const char *mode, int fd));
39 + //local int do_flush OF((gzFile file, int flush));
40 + //local int get_byte OF((gz_stream *s));
41 +-local void check_header OF((gz_stream *s));
42 +-local int destroy OF((gz_stream *s));
43 ++local void check_header _Z_OF((gz_stream *s));
44 ++local int destroy _Z_OF((gz_stream *s));
45 + //local void putLong OF((FILE *file, uLong x));
46 +-local uLong getLong OF((gz_stream *s));
47 ++local uLong getLong _Z_OF((gz_stream *s));
48 +
49 + /* ===========================================================================
50 + Opens a gzip (.gz) file for reading or writing. The mode parameter
51 +Index: gpac-1.0.0/src/utils/zutil.h
52 +===================================================================
53 +--- gpac-1.0.0.orig/src/utils/zutil.h
54 ++++ gpac-1.0.0/src/utils/zutil.h
55 +@@ -262,8 +262,8 @@ extern void z_error OF((char *m));
56 + #endif
57 +
58 +
59 +-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
60 +-void zcfree OF((voidpf opaque, voidpf ptr));
61 ++voidpf zcalloc _Z_OF((voidpf opaque, unsigned items, unsigned size));
62 ++void zcfree _Z_OF((voidpf opaque, voidpf ptr));
63 +
64 + #define ZALLOC(strm, items, size) \
65 + (*((strm)->zalloc))((strm)->opaque, (items), (size))
66
67 diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-1.0.0.ebuild
68 similarity index 89%
69 copy from media-video/gpac/gpac-9999.ebuild
70 copy to media-video/gpac/gpac-1.0.0.ebuild
71 index 5c4fcbaddd1..37ed1edce4a 100644
72 --- a/media-video/gpac/gpac-9999.ebuild
73 +++ b/media-video/gpac/gpac-1.0.0.ebuild
74 @@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
75
76 LICENSE="GPL-2"
77 # subslot == libgpac major
78 -SLOT="0/7"
79 +SLOT="0/10"
80 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
81 pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
82
83 @@ -56,28 +56,23 @@ RDEPEND="
84 xml? ( dev-libs/libxml2:2 )
85 xvid? ( media-libs/xvid )
86 "
87 -# disabled upstream, see applications/Makefile
88 -# wxwidgets? ( =x11-libs/wxGTK-2.8* )
89 DEPEND="${RDEPEND}
90 virtual/pkgconfig
91 dvb? ( sys-kernel/linux-headers )
92 "
93
94 -PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
95 +PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
96
97 DOCS=(
98 - doc/CODING_STYLE
99 - doc/GPAC\ UPnP.doc
100 - doc/ISO\ 639-2\ codes.txt
101 - doc/SceneGenerators
102 - doc/ipmpx_syntax.bt
103 + share/doc/CODING_STYLE
104 + share/doc/GPAC\ UPnP.doc
105 + share/doc/ISO\ 639-2\ codes.txt
106 + share/doc/SceneGenerators
107 + share/doc/ipmpx_syntax.bt
108 Changelog
109 - AUTHORS
110 - BUGS
111 README.md
112 - TODO
113 )
114 -HTML_DOCS="doc/*.html"
115 +HTML_DOCS="share/doc/*.html"
116
117 my_use() {
118 local flag="$1" pflag="${2:-$1}"
119 @@ -104,7 +99,6 @@ src_configure() {
120 --enable-pic
121 --enable-svg
122 --disable-amr
123 - --disable-wx
124 --use-js=no
125 --use-ogg=system
126 $(use_enable alsa)
127
128 diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
129 index 5c4fcbaddd1..37ed1edce4a 100644
130 --- a/media-video/gpac/gpac-9999.ebuild
131 +++ b/media-video/gpac/gpac-9999.ebuild
132 @@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
133
134 LICENSE="GPL-2"
135 # subslot == libgpac major
136 -SLOT="0/7"
137 +SLOT="0/10"
138 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
139 pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
140
141 @@ -56,28 +56,23 @@ RDEPEND="
142 xml? ( dev-libs/libxml2:2 )
143 xvid? ( media-libs/xvid )
144 "
145 -# disabled upstream, see applications/Makefile
146 -# wxwidgets? ( =x11-libs/wxGTK-2.8* )
147 DEPEND="${RDEPEND}
148 virtual/pkgconfig
149 dvb? ( sys-kernel/linux-headers )
150 "
151
152 -PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
153 +PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
154
155 DOCS=(
156 - doc/CODING_STYLE
157 - doc/GPAC\ UPnP.doc
158 - doc/ISO\ 639-2\ codes.txt
159 - doc/SceneGenerators
160 - doc/ipmpx_syntax.bt
161 + share/doc/CODING_STYLE
162 + share/doc/GPAC\ UPnP.doc
163 + share/doc/ISO\ 639-2\ codes.txt
164 + share/doc/SceneGenerators
165 + share/doc/ipmpx_syntax.bt
166 Changelog
167 - AUTHORS
168 - BUGS
169 README.md
170 - TODO
171 )
172 -HTML_DOCS="doc/*.html"
173 +HTML_DOCS="share/doc/*.html"
174
175 my_use() {
176 local flag="$1" pflag="${2:-$1}"
177 @@ -104,7 +99,6 @@ src_configure() {
178 --enable-pic
179 --enable-svg
180 --disable-amr
181 - --disable-wx
182 --use-js=no
183 --use-ogg=system
184 $(use_enable alsa)
Report Message
Find on MARC Find on Google Groups