Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/
Date: Thu, 29 Nov 2018 23:01:58
Message-Id: 1543532494.244a5252d72f3ed718413202c7fef5aed9ad6073.asturm@gentoo
1 commit: 244a5252d72f3ed718413202c7fef5aed9ad6073
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 29 22:54:43 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 29 23:01:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244a5252
7
8 media-video/gpac: Sync 9999 with 0.7.1-r1
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-video/gpac/gpac-9999.ebuild | 110 +++++++++++++++++++++-----------------
14 1 file changed, 61 insertions(+), 49 deletions(-)
15
16 diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
17 index 0beb2918a9d..5acc9d8e2d3 100644
18 --- a/media-video/gpac/gpac-9999.ebuild
19 +++ b/media-video/gpac/gpac-9999.ebuild
20 @@ -23,41 +23,48 @@ IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad ope
21 pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
22
23 RDEPEND="
24 + media-libs/libogg
25 a52? ( media-libs/a52dec )
26 - aac? ( >=media-libs/faad2-2.0 )
27 + aac? ( media-libs/faad2 )
28 alsa? ( media-libs/alsa-lib )
29 - dvb? ( media-tv/linuxtv-dvb-apps )
30 ffmpeg? (
31 !libav? ( media-video/ffmpeg:0= )
32 - libav? ( media-video/libav:0= ) )
33 - jack? ( media-sound/jack-audio-connection-kit )
34 + libav? ( media-video/libav:0= )
35 + )
36 + jack? ( virtual/jack )
37 jpeg? ( virtual/jpeg:0 )
38 - mad? ( >=media-libs/libmad-0.15.1b )
39 - opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
40 - >=media-libs/libogg-1.1
41 - png? ( >=media-libs/libpng-1.4:0= )
42 - vorbis? ( >=media-libs/libvorbis-1.1 )
43 + jpeg2k? ( media-libs/openjpeg:0 )
44 + mad? ( media-libs/libmad )
45 + opengl? (
46 + media-libs/freeglut
47 + virtual/glu
48 + virtual/opengl
49 + )
50 + png? ( media-libs/libpng:0= )
51 + pulseaudio? ( media-sound/pulseaudio )
52 theora? ( media-libs/libtheora )
53 - truetype? ( >=media-libs/freetype-2.1.4:2 )
54 - xml? ( >=dev-libs/libxml2-2.6.0:2 )
55 - xvid? ( >=media-libs/xvid-1.0.1 )
56 + truetype? ( media-libs/freetype:2 )
57 sdl? ( media-libs/libsdl )
58 - jpeg2k? ( media-libs/openjpeg:0 )
59 ssl? (
60 !libressl? ( dev-libs/openssl:0= )
61 - libressl? ( dev-libs/libressl:0= ) )
62 - pulseaudio? ( media-sound/pulseaudio )
63 + libressl? ( dev-libs/libressl:0= )
64 + )
65 + vorbis? ( media-libs/libvorbis )
66 X? (
67 x11-libs/libXt
68 x11-libs/libX11
69 x11-libs/libXv
70 x11-libs/libXext
71 )
72 + xml? ( dev-libs/libxml2:2 )
73 + xvid? ( media-libs/xvid )
74 "
75 # disabled upstream, see applications/Makefile
76 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
77 DEPEND="${RDEPEND}
78 - virtual/pkgconfig"
79 + virtual/pkgconfig
80 + dvb? ( sys-kernel/linux-headers )
81 +"
82
83 PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
84
85 @@ -92,40 +99,45 @@ src_prepare() {
86 src_configure() {
87 tc-export CC CXX AR RANLIB
88
89 - econf \
90 - --enable-svg \
91 - --enable-pic \
92 - --disable-amr \
93 - --use-js=no \
94 - --use-ogg=system \
95 - $(use_enable alsa) \
96 - $(use_enable debug) \
97 - $(use_enable ipv6) \
98 - $(use_enable jack jack yes) \
99 - $(use_enable opengl 3d) \
100 - $(use_enable oss oss-audio) \
101 - $(use_enable pulseaudio pulseaudio yes) \
102 - $(use_enable sdl) \
103 - $(use_enable ssl) \
104 - $(use_enable static-libs static-lib) \
105 - $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
106 - --disable-wx \
107 - $(my_use a52) \
108 - $(my_use aac faad) \
109 - $(my_use dvb dvbx) \
110 - $(my_use ffmpeg) \
111 - $(my_use jpeg) \
112 - $(my_use jpeg2k openjpeg) \
113 - $(my_use mad) \
114 - $(my_use png) \
115 - $(my_use theora) \
116 - $(my_use truetype ft) \
117 - $(my_use vorbis) \
118 - $(my_use xvid) \
119 - --extra-cflags="${CFLAGS}" \
120 - --cc="$(tc-getCC)" \
121 - --libdir="/$(get_libdir)" \
122 + local myeconfargs=(
123 + --extra-cflags="${CFLAGS}"
124 + --cc="$(tc-getCC)"
125 + --libdir="/$(get_libdir)"
126 --verbose
127 + --enable-pic
128 + --enable-svg
129 + --disable-amr
130 + --disable-wx
131 + --use-js=no
132 + --use-ogg=system
133 + $(use_enable alsa)
134 + $(use_enable debug)
135 + $(use_enable dvb dvb4linux)
136 + $(use_enable ipv6)
137 + $(use_enable jack jack yes)
138 + $(use_enable opengl 3d)
139 + $(use_enable oss oss-audio)
140 + $(use_enable pulseaudio pulseaudio yes)
141 + $(use_enable sdl)
142 + $(use_enable ssl)
143 + $(use_enable static-libs static-lib)
144 + $(use_enable X x11)
145 + $(use_enable X x11-shm)
146 + $(use_enable X x11-xv)
147 + $(my_use a52)
148 + $(my_use aac faad)
149 + $(my_use dvb dvbx)
150 + $(my_use ffmpeg)
151 + $(my_use jpeg)
152 + $(my_use jpeg2k openjpeg)
153 + $(my_use mad)
154 + $(my_use png)
155 + $(my_use theora)
156 + $(my_use truetype ft)
157 + $(my_use vorbis)
158 + $(my_use xvid)
159 + )
160 + econf "${myeconfargs[@]}"
161 }
162
163 src_install() {