summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-14 20:08:54 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-14 20:08:54 +0000
commit5ccd8f577bf616c5175fe2bd64882904ea007046 (patch)
treefdbfebea246865137fa1a8600172ee8d413e4c5d /media-video/gpac
parentupdate patch from Oscar L via bug #481082 (diff)
downloadgentoo-2-5ccd8f577bf616c5175fe2bd64882904ea007046.tar.gz
gentoo-2-5ccd8f577bf616c5175fe2bd64882904ea007046.tar.bz2
gentoo-2-5ccd8f577bf616c5175fe2bd64882904ea007046.zip
factorize some code and sort alphabetically econf args
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/gpac')
-rw-r--r--media-video/gpac/ChangeLog5
-rw-r--r--media-video/gpac/gpac-0.5.0.ebuild32
2 files changed, 17 insertions, 20 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index def202e8c427..9275be9eb9dd 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/gpac
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.107 2013/08/14 19:56:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.108 2013/08/14 20:08:54 aballier Exp $
+
+ 14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
+ factorize some code and sort alphabetically econf args
14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0.ebuild:
depend on virtual/glu, bug #466632 by andcycle-gentoo.bugs@andcycle.idv.tw
diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild
index 1bf41fa35cce..3198be8d6df5 100644
--- a/media-video/gpac/gpac-0.5.0.ebuild
+++ b/media-video/gpac/gpac-0.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.6 2013/08/14 19:56:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0.ebuild,v 1.7 2013/08/14 20:08:54 aballier Exp $
EAPI=4
@@ -90,14 +90,6 @@ src_prepare() {
}
src_configure() {
- myconf="${myconf} --use-ogg=system"
- if use vorbis; then
- myconf="${myconf} --use-vorbis=system"
- fi
- if use theora; then
- myconf="${myconf} --use-theora=system"
- fi
-
tc-export CC CXX AR RANLIB
econf \
@@ -105,30 +97,32 @@ src_configure() {
--enable-pic \
--disable-amr \
--use-js=no \
+ --use-ogg=system \
+ $(use_enable alsa) \
$(use_enable debug) \
- $(use_enable opengl) \
- $(use_enable oss oss-audio) \
- $(use_enable ssl) \
$(use_enable ipv6) \
$(use_enable jack jack yes) \
+ $(use_enable opengl) \
+ $(use_enable oss oss-audio) \
$(use_enable pulseaudio pulseaudio yes) \
- $(use_enable alsa) \
$(use_enable sdl) \
- $(use_enable wxwidgets wx) \
+ $(use_enable ssl) \
$(use_enable static-libs static-lib) \
- $(my_use ffmpeg) \
+ $(use_enable wxwidgets wx) \
+ $(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) \
- $(my_use jpeg2k openjpeg) \
- $(my_use a52) \
--cc="$(tc-getCC)" \
- --libdir="/$(get_libdir)" \
- ${myconf}
+ --libdir="/$(get_libdir)"
#temporary build fix
cp config.h include/gpac/