[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/
commit: e3b49a82ab22c1df1945b891e0bbdb06b3c4ccad
Author: Sam James gentoo org>
AuthorDate: Sat Aug 14 02:56:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 14 03:48:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b49a82
media-sound/ogmtools: add missing libogg, libvorbis deps (+ subslot deps)
Signed-off-by: Sam James gentoo.org>
.../ogmtools/{ogmtools-1.5-r2.ebuild => ogmtools-1.5-r3.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r3.ebuild
similarity index 92%
rename from media-sound/ogmtools/ogmtools-1.5-r2.ebuild
rename to media-sound/ogmtools/ogmtools-1.5-r3.ebuild
index 31e8539b757..818583eb094 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r3.ebuild
@@ -15,8 +15,10 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="dvd"
RDEPEND="
+ media-libs/libogg
+ media-libs/libvorbis
media-sound/vorbis-tools
- dvd? ( media-libs/libdvdread )"
+ dvd? ( media-libs/libdvdread:= )"
DEPEND="${RDEPEND}"
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/files/, media-sound/ogmtools/
commit: 50f6532b2a846a2576f69858d0ad5bf70bf54cf1
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 29 22:03:39 2021 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 29 22:03:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f6532b
media-sound/ogmtools: Fix building against GCC 11
Closes: https://bugs.gentoo.org/786543
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Suggested-by: Matt Whitlock mattwhitlock.name>
Signed-off-by: David Seifert gentoo.org>
.../ogmtools/files/ogmtools-1.5-gcc11.patch| 374 +
media-sound/ogmtools/ogmtools-1.5-r2.ebuild| 3 +-
2 files changed, 376 insertions(+), 1 deletion(-)
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
new file mode 100644
index 000..2e117687a44
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch
@@ -0,0 +1,374 @@
+--- a/p_ac3.cpp
b/p_ac3.cpp
+@@ -30,7 +30,7 @@
+ ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec,
+int nchannels, int nbitrate,
+audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_ac3.h
b/p_ac3.h
+@@ -40,7 +40,7 @@
+ public:
+ ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nbitrate, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~ac3_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_index.cpp
b/p_index.cpp
+@@ -28,7 +28,7 @@
+ #include "p_index.h"
+ #include "vorbis_header_utils.h"
+
+-index_packetizer_c::index_packetizer_c(int nserial) throw (error_c) : q_c() {
++index_packetizer_c::index_packetizer_c(int nserial) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ granulepos = 0;
+--- a/p_index.h
b/p_index.h
+@@ -33,7 +33,7 @@
+ ogg_int64_t granulepos, packetno;
+ int serial;
+ public:
+-index_packetizer_c(int nserial) throw (error_c);
++index_packetizer_c(int nserial);
+ virtual ~index_packetizer_c();
+
+ virtual int process(idx_entry *entries, int num);
+--- a/p_mp3.cpp
b/p_mp3.cpp
+@@ -30,7 +30,7 @@
+ mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec,
+int nchannels, int nmp3rate,
+audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_mp3.h
b/p_mp3.h
+@@ -40,7 +40,7 @@
+ public:
+ mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nmp3rate, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~mp3_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_pcm.cpp
b/p_pcm.cpp
+@@ -29,7 +29,7 @@
+ pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec,
+int nchannels, int nbits_per_sample,
+audio_sync_t *nasync, range_t *nrange,
+- char **ncomments) throw (error_c) : q_c() {
++ char **ncomments) : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_pcm.h
b/p_pcm.h
+@@ -37,7 +37,7 @@
+ public:
+ pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels,
+ int nbits_per_sample, audio_sync_t *nasync,
+- range_t *nrange, char **ncomments) throw (error_c);
++ range_t *nrange, char **ncomments);
+ virtual ~pcm_packetizer_c();
+
+ virtual int process(char *buf, int size, int last_frame);
+--- a/p_textsubs.cpp
b/p_textsubs.cpp
+@@ -29,7 +29,7 @@
+
+ textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync,
+ range_t *nrange, char
**ncomments)
+- throw (error_c) : q_c() {
++ : q_c() {
+ serialno = create_unique_serial();
+ ogg_stream_init(&os, serialno);
+ packetno = 0;
+--- a/p_textsubs.h
b/p_textsubs.h
+@@ -30,7 +30,7 @@
+
+ pu
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/files/, media-sound/ogmtools/
commit: 77f077259f2455e3d6219462ec3f178f6fd8541c
Author: David Seifert gentoo org>
AuthorDate: Sun Jun 21 13:19:58 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jun 21 13:19:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f07725
media-sound/ogmtools: [QA] Fix build system
Closes: https://bugs.gentoo.org/724678
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert gentoo.org>
.../files/ogmtools-1.5-fix-autotools.patch | 44 ++
media-sound/ogmtools/ogmtools-1.5-r2.ebuild| 29 +-
2 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch
b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch
new file mode 100644
index 000..74aba946306
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-fix-autotools.patch
@@ -0,0 +1,44 @@
+--- a/avilib/Makefile.am
b/avilib/Makefile.am
+@@ -7,7 +7,8 @@
+
+ INCLUDES = -I./
+
+-CFLAGS=-O3 -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
++AM_CFLAGS=-Wall
++AM_CPPFLAGS=-DLINUX
+ libavi_a_SOURCES = avilib.c avidump.c avimisc.c xio.c
+
+ EXTRA_DIST = avilib.h README.avilib
+--- a/configure.in
b/configure.in
+@@ -8,6 +8,7 @@
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+ XIPH_PATH_OGG()
+ XIPH_PATH_VORBIS()
+@@ -31,7 +32,7 @@
+ dnl Check for headers
+ AC_HEADER_STDC()
+
+-CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@
@DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
+-CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@
@AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@"
++CFLAGS+=" -Wall -Wno-sign-compare"
++CXXFLAGS+=" -Wall -Wno-sign-compare"
+
+ AC_OUTPUT(Makefile avilib/Makefile)
+--- a/Makefile.am
b/Makefile.am
+@@ -2,6 +2,9 @@
+
+ AUTOMAKE_OPTIONS = dist-zip foreign
+
++AM_CFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS)
$(PROFILING_CFLAGS)
++AM_CXXFLAGS=$(OGG_CFLAGS) $(VORBIS_CFLAGS) $(AVILIB_CFLAGS) $(DEBUG_CFLAGS)
$(PROFILING_CFLAGS)
++
+ SUBDIRS = avilib
+
+ if HAVE_LIBDVDREAD
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 7e1a4b01a91..28fb209d7f3 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit autotools
DESCRIPTION="Information, extraction or creation for OGG media streams"
HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/";
@@ -12,20 +14,27 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="dvd"
-RDEPEND="dvd? ( media-libs/libdvdread )
- media-sound/vorbis-tools"
+RDEPEND="
+ media-sound/vorbis-tools
+ dvd? ( media-libs/libdvdread )"
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-comments.patch"
- "${FILESDIR}/${P}-endian-fix.patch"
- "${FILESDIR}/${P}-vorbis_verbosity.patch"
- "${FILESDIR}/${P}-summary_length.patch"
+ "${FILESDIR}"/${P}-comments.patch
+ "${FILESDIR}"/${P}-endian-fix.patch
+ "${FILESDIR}"/${P}-vorbis_verbosity.patch
+ "${FILESDIR}"/${P}-summary_length.patch
+ "${FILESDIR}"/${P}-fix-autotools.patch
)
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
src_configure() {
- econf \
- $(use_with dvd dvdread)
+ econf $(use_with dvd dvdread)
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/
commit: d95d3c8e75d9471934510fddfdea6992e71f9d9e
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Mar 8 18:14:50 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 10 10:18:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95d3c8e
media-sound/ogmtools: use HTTPS
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 2615313a813..7e1a4b01a91 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Information, extraction or creation for OGG media streams"
-HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/";
-SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2";
+HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/";
+SRC_URI="https://www.bunkus.org/videotools/${PN}/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/
commit: fe39068d8e28d6850f29dbe47cfceceab5b52566
Author: Aaron Bauman gentoo org>
AuthorDate: Wed May 30 00:04:24 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed May 30 00:27:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe39068d
media-sound/ogmtools: fix einstalldocs
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 2abca8c77f1..56f8611e8a2 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -35,6 +35,6 @@ src_install() {
dobin dvdxchap
fi
- einstalldocs ChangeLog README TODO
+ einstalldocs
doman *.1
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/, media-sound/ogmtools/files/
commit: c97c4196d1afa73e3c48743ebf59c36761821c20
Author: Aaron Bauman gentoo org>
AuthorDate: Tue May 29 21:30:53 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed May 30 00:27:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97c4196
media-sound/ogmtools: bump EAPI and drop eutils
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../ogmtools/files/ogmtools-1.5-comments.patch | 4 ++--
.../ogmtools/files/ogmtools-1.5-endian-fix.patch | 4 ++--
.../files/ogmtools-1.5-summary_length.patch| 5 ++---
.../files/ogmtools-1.5-vorbis_verbosity.patch | 5 ++---
media-sound/ogmtools/ogmtools-1.5-r2.ebuild| 23 +++---
5 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
index 0440a8040b8..c331baa8b90 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -1,5 +1,5 @@
vorbis_header_utils.c.orig Fri Aug 31 14:47:55 2007
-+++ vorbis_header_utils.c Fri Aug 31 14:51:23 2007
+--- a/vorbis_header_utils.c
b/vorbis_header_utils.c
@@ -153,15 +153,15 @@
die("malloc");
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
index 8945ca47c08..0c8758027a0 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
@@ -1,5 +1,5 @@
avilib/avidump.c.orig 2004-11-02 15:30:16.0 +
-+++ avilib/avidump.c 2004-11-17 19:12:02.730255128 +
+--- a/avilib/avidump.c
b/avilib/avidump.c
@@ -54,7 +54,7 @@
((x<<8) & 0x00ff) |\
((x<<24) & 0xff00))
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
index 8457918beb8..00c2ee06c6b 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
ogmtools-1.5.orig/ogminfo.c2003-11-21 00:21:36.0 +0200
-+++ ogmtools-1.5/ogminfo.c 2009-05-12 12:41:58.0 +0300
+--- a/ogminfo.c
b/ogminfo.c
@@ -513,7 +513,7 @@
stream->serial, stream->size,
(stream->size * 8.0 / 1000.0) / now,
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
index 085cc5d978d..5b71402649e 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
ogmtools-1.5.orig/ogminfo.c2003-11-21 00:21:36.0 +0200
-+++ ogmtools-1.5/ogminfo.c 2009-05-12 12:42:56.0 +0300
+--- a/ogminfo.c
b/ogminfo.c
@@ -188,7 +188,7 @@
}
vorbis_comment_clear(&vc);
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 8e6971a61fc..2abca8c77f1 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=2
-inherit eutils
+EAPI=6
DESCRIPTION="Information, extraction or creation for OGG media streams"
HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/";
@@ -17,12 +16,12 @@ RDEPEND="dvd? ( media-libs/libdvdread )
media-sound/vorbis-tools"
DEPEND="${RDEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-comments.patch \
- "${FILESDIR}"/${P}-endian-fix.patch \
- "${FILESDIR}"/${P}-vorbis_verbosity.patch \
- "${FILESDIR}"/${P}-summary_length.patch
-}
+PATCHES=(
+ "${FILESDIR}/${P}-comments.patch"
+ "${FILESDIR}/${P}-endian-fix.patch"
+ "${FILESDIR}/${P}-vorbis_verbosity.patch"
+ "${FILESDIR}/${P}-summary_length.patch"
+)
src_configure() {
econf \
@@ -30,12 +29,12 @@ src_configure() {
}
src_install() {
- dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+ dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
if use dvd; then
- dobin dvdxchap || die "dobin failed"
+ dobin dvdxchap
fi
- dodoc ChangeLog README TODO
+ einstalldocs ChangeLog README TODO
doman *.1
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/
commit: de93069d0637d865d95327dad6cbcedbb69d64ab
Author: Aaron Bauman gentoo org>
AuthorDate: Wed May 30 00:17:17 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed May 30 00:27:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de93069d
media-sound/ogmtools: remove if/then in favor of use &&
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 56f8611e8a2..2615313a813 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -31,9 +31,7 @@ src_configure() {
src_install() {
dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
- if use dvd; then
- dobin dvdxchap
- fi
+ use dvd && dobin dvdxchap
einstalldocs
doman *.1
