From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
Date: Fri, 22 Jan 2021 03:34:52 +0000 (UTC) [thread overview]
Message-ID: <1611286486.5f2a9819918f18f9001ff08a4ab2c9dec0f2861a.sam@gentoo> (raw)
commit: 5f2a9819918f18f9001ff08a4ab2c9dec0f2861a
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Jan 20 01:37:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 03:34:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2a9819
media-video/gpac: cleanup for openjpeg cleanup
Closes: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19133
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/gpac/Manifest | 1 -
media-video/gpac/files/gpac-0.8.1-configure.patch | 100 ---------------
media-video/gpac/gpac-0.8.1.ebuild | 149 ----------------------
3 files changed, 250 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3eb8fc2546c..3119d5d920e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch b/media-video/gpac/files/gpac-0.8.1-configure.patch
deleted file mode 100644
index 4a6c97b6cf3..00000000000
--- a/media-video/gpac/files/gpac-0.8.1-configure.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 61241cd..7481027 100644
---- a/Makefile
-+++ b/Makefile
-@@ -270,7 +270,9 @@ ifeq ($(GPAC_ENST), yes)
- $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
- mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATIC_LIBS),yes)
- $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
- $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
- fi
-diff --git a/configure b/configure
-index 6ef2258..240b6b0 100755
---- a/configure
-+++ b/configure
-@@ -108,6 +108,7 @@ has_xmlrpc="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -266,6 +267,7 @@ GPAC configuration options:
- --enable-amr-wb enable AMR WB library
- --enable-amr enable both AMR NB and WB libraries
- --enable-static-bin link statically against libgpac
-+ --enable-static-lib GPAC static libraries build
- --static-mp4box configure for static linking of MP4Box only.
- --enable-depth enables depth handling in the compositor
-
-@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- fi
-
--
--#GCC opt
--if test "$no_gcc_opt" = "no"; then
-- CFLAGS="-O3 $CFLAGS"
--else
-- CFLAGS="-O0 $CFLAGS"
--fi
--
--
- #GCC PIC
- if test "$cross_prefix" != "" ; then
- want_pic="no"
-@@ -1931,6 +1924,8 @@ for opt do
- ;;
- --enable-static-bin) static_build="yes";
- ;;
-+ --enable-static-lib) static_libs="yes";
-+ ;;
- --disable-ipv6) has_ipv6="no"
- ;;
- --disable-wx) has_wx="no"
-@@ -2622,6 +2617,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Sanitizer enabled: $enable_sanitizer"
- echo "Fixed-Point Version: $use_fixed_point"
-@@ -3291,6 +3287,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
-
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-diff --git a/src/Makefile b/src/Makefile
-index 935ffff..b3464b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR)
-
- ifeq ($(CONFIG_DARWIN),yes)
-
-+ifeq ($(STATICLIBS),yes)
- $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
- $(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
- endif
-
- else
--
-+ifeq ($(STATICLIBS), yes)
- $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
- $(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
- mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-0.8.1.ebuild b/media-video/gpac/gpac-0.8.1.ebuild
deleted file mode 100644
index 4404cc73915..00000000000
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
- SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/ https://github.com/gpac/gpac"
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/8"
-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"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- media-libs/libogg
- a52? ( media-libs/a52dec )
- aac? ( media-libs/faad2 )
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( media-video/ffmpeg:0= )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- mad? ( media-libs/libmad )
- opengl? (
- media-libs/freeglut
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- theora? ( media-libs/libtheora )
- truetype? ( media-libs/freetype:2 )
- sdl? ( media-libs/libsdl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- vorbis? ( media-libs/libvorbis )
- X? (
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/libXext
- )
- xml? ( dev-libs/libxml2:2 )
- xvid? ( media-libs/xvid )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
- dvb? ( sys-kernel/linux-headers )
-"
-
-# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
-PATCHES=(
- "${FILESDIR}/${PN}-0.8.1-configure.patch"
-)
-
-DOCS=(
- doc/CODING_STYLE
- doc/GPAC\ UPnP.doc
- doc/ISO\ 639-2\ codes.txt
- doc/SceneGenerators
- doc/ipmpx_syntax.bt
- Changelog
- AUTHORS
- BUGS
- README.md
- TODO
-)
-
-HTML_DOCS="doc/*.html"
-
-my_use() {
- local flag="$1" pflag="${2:-$1}"
- if use ${flag}; then
- echo "--use-${pflag}=system"
- else
- echo "--use-${pflag}=no"
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
- tc-export CC CXX AR RANLIB
-
- local myeconfargs=(
- --extra-cflags="${CFLAGS}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --libdir="/$(get_libdir)"
- --verbose
- --enable-pic
- --enable-svg
- --disable-amr
- --disable-wx
- --use-js=no
- --use-ogg=system
- $(use_enable alsa)
- $(use_enable debug)
- $(use_enable dvb dvb4linux)
- $(use_enable ipv6)
- $(use_enable jack jack yes)
- $(use_enable opengl 3d)
- $(use_enable oss oss-audio)
- $(use_enable pulseaudio pulseaudio yes)
- $(use_enable sdl)
- $(use_enable ssl)
- $(use_enable static-libs static-lib)
- $(use_enable X x11)
- $(use_enable X x11-shm)
- $(use_enable X x11-xv)
- $(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)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- einstalldocs
- emake STRIP="true" DESTDIR="${D}" install
- emake STRIP="true" DESTDIR="${D}" install-lib
-}
next reply other threads:[~2021-01-22 3:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 3:34 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-26 2:48 [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/ Ionen Wolkens
2022-02-25 9:46 Alexis Ballier
2020-09-08 22:42 Sam James
2020-09-04 16:47 Alexis Ballier
2020-08-31 23:15 Sam James
2020-08-20 12:30 Sam James
2019-01-30 16:12 Andreas Sturmlechner
2018-06-13 16:21 Lars Wendler
2018-04-20 18:12 Alexis Ballier
2015-08-22 9:29 Alexis Ballier
2015-08-22 9:17 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1611286486.5f2a9819918f18f9001ff08a4ab2c9dec0f2861a.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox