* [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/files/, media-libs/libtheora/
@ 2025-06-15 2:07 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-06-15 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 2ae72c951c5e2ed68e3b88b3f3d557b3376c0cd1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 02:00:22 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 02:05:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae72c95
media-libs/libtheora: add 1.2.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libtheora/Manifest | 1 +
.../libtheora/files/libtheora-1.2.0-flags.patch | 13 ++++
media-libs/libtheora/libtheora-1.2.0.ebuild | 89 ++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 174c8d4aaa5b..d0b5df471abe 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1 +1,2 @@
DIST libtheora-1.1.1.tar.xz 1434496 BLAKE2B f5df62c68c31537582f8a2ea64dba6b01cc056f364aa06fe905e42cc7aa8c78d7de89419dd52d586210ea29cdfdb24c2ff01e490c9b137e5d2f1845a2aa430de SHA512 032fb60f10ac0074ec87d5f8c586702309edc50dc0d2842d2f9b9c46ebd1500acc399e9309f858f318fff5b8fbe953234db3afb54ed74a03d0f2c6ee8c3ed481
+DIST libtheora-1.2.0.tar.xz 1803124 BLAKE2B f1264e9d5b0624f41780d7b6815f295309529f3c21a1aff9536239c9691b916912c9d3a1877e58506c7e1a37f1367c48d9b0765fe27f6c1db69a361aa9865eee SHA512 849db0c916f0f0b1237a4893594ff4b9e72d4ad1dca42f3f2979af5971f42c3fe77a75b181dfdd1c1353bbca4c832d6ab43f6d509c0650901c692e96ceab5f26
diff --git a/media-libs/libtheora/files/libtheora-1.2.0-flags.patch b/media-libs/libtheora/files/libtheora-1.2.0-flags.patch
new file mode 100644
index 000000000000..508525340999
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.2.0-flags.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,8 +202,8 @@ else
+ case $host in
+ *)
+ DEBUG="-g -Wall -Werror=uninitialized -Winit-self -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+- CFLAGS="-Wall -Werror=uninitialized -Winit-self -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+- PROFILE="-Wall -Werror=uninitialized -Winit-self -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
++ CFLAGS="-Wall -Werror=uninitialized -Winit-self -Wno-parentheses"
++ PROFILE="-Wall -Werror=uninitialized -Winit-self -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
+ esac
+ fi
+ CFLAGS="$CFLAGS $cflags_save"
diff --git a/media-libs/libtheora/libtheora-1.2.0.ebuild b/media-libs/libtheora/libtheora-1.2.0.ebuild
new file mode 100644
index 000000000000..b843dca5b51b
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="https://www.theora.org"
+SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.xz"
+S="${WORKDIR}"/${P/_}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc +encode examples static-libs"
+
+REQUIRED_USE="examples? ( encode )" # bug #285895
+
+RDEPEND="
+ >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
+ encode? ( >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] )
+ examples? (
+ media-libs/libpng:=
+ >=media-libs/libsdl-0.11.0
+ media-libs/libvorbis:=
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+VARTEXFONTS=${T}/fonts
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0-flags.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+ local myconf=(
+ # --disable-spec because LaTeX documentation has been prebuilt
+ # ditto docs
+ --disable-doc
+ --disable-spec
+ $(use_enable encode)
+ $(multilib_native_use_enable examples)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ if multilib_is_native_abi && use examples ; then
+ dobin examples/.libs/png2theora
+
+ local bin
+ for bin in dump_{psnr,video} {encoder,player}_example; do
+ newbin examples/.libs/${bin} theora_${bin}
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ einstalldocs
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.[ch]
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto .
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/files/, media-libs/libtheora/
@ 2025-09-11 22:32 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-09-11 22:32 UTC (permalink / raw
To: gentoo-commits
commit: becf8dc7c09ffa08e89c38a7eac141032ab7abd0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 20:01:58 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 22:31:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=becf8dc7
media-libs/libtheora: drop 1.1.1-r2
Closes: https://bugs.gentoo.org/962102
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libtheora/Manifest | 1 -
.../files/libtheora-1.0_beta2-flags.patch | 14 ----
.../libtheora/files/libtheora-1.1.1-fix-UB.patch | 47 -----------
.../libtheora/files/libtheora-1.1.1-libpng16.patch | 17 ----
.../files/libtheora-1.1.1-underlinking.patch | 14 ----
media-libs/libtheora/libtheora-1.1.1-r2.ebuild | 96 ----------------------
6 files changed, 189 deletions(-)
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index bcedbc0a4f09..02259b4b762c 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,4 +1,3 @@
-DIST libtheora-1.1.1.tar.xz 1434496 BLAKE2B f5df62c68c31537582f8a2ea64dba6b01cc056f364aa06fe905e42cc7aa8c78d7de89419dd52d586210ea29cdfdb24c2ff01e490c9b137e5d2f1845a2aa430de SHA512 032fb60f10ac0074ec87d5f8c586702309edc50dc0d2842d2f9b9c46ebd1500acc399e9309f858f318fff5b8fbe953234db3afb54ed74a03d0f2c6ee8c3ed481
DIST libtheora-1.2.0-armenc.c 2129 BLAKE2B 83e5ada6560ef7e6b0a26bb72278b62f34c815e07d741ba64b11599b88e817805fe54a9f82c9d0d312995beaae3862be4e1017ce3b3507cd0de678267dc218d1 SHA512 f83045841b17362f133ca45926af687ab1535970f9da215b81b2e4e613ae3cdf295357eb497ebd4e3e94cee283ab388db51ef4dd28cc13d535651defdf223879
DIST libtheora-1.2.0-armloop.s 23216 BLAKE2B 75bb61eda41c86eecb9d75449358f1363f7f4a9ed356ea3e5ba54fc63d8ef853f37421e5d27b0b1de3e915a35b471c9272b214cb13d93a4ae9a9f05bc1c87261 SHA512 8774bea8ed3adfd51fc727eef3a256fa3817a4e8554995afd572bd8f22b0979b2573c54cfb183dcc254ecce34ade6ef6748339ba91e1dc12a03d163f453032e8
DIST libtheora-1.2.0.tar.xz 1803124 BLAKE2B f1264e9d5b0624f41780d7b6815f295309529f3c21a1aff9536239c9691b916912c9d3a1877e58506c7e1a37f1367c48d9b0765fe27f6c1db69a361aa9865eee SHA512 849db0c916f0f0b1237a4893594ff4b9e72d4ad1dca42f3f2979af5971f42c3fe77a75b181dfdd1c1353bbca4c832d6ab43f6d509c0650901c692e96ceab5f26
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch b/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
deleted file mode 100644
index ffc6ab5802af..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac
---- a/configure.ac 2007-10-13 00:01:38.000000000 +0300
-+++ b/configure.ac 2007-11-25 22:44:49.000000000 +0200
-@@ -102,8 +102,8 @@
- case $host in
- *)
- DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
-- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
-- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
-+ CFLAGS="-Wall -Wno-parentheses"
-+ PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
- esac
- fi
- CFLAGS="$CFLAGS $cflags_save"
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch b/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
deleted file mode 100644
index 862d6a3b8164..000000000000
--- a/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0ae66d565e6bead8604d312bc1a4e9dccf245c88 Mon Sep 17 00:00:00 2001
-From: Tim Terriberry <tterribe@xiph.org>
-Date: Tue, 8 May 2012 02:51:57 +0000
-Subject: [PATCH] Fix pp_sharp_mod calculation.
-
-This was broken when the dequant_tables indexing changed in commit
- r16102, but it only affected post-processing quality, so we never
- noticed.
-With gcc 4.8.0, this can now trigger a segfault during decoder
- initialization.
-
-svn path=/trunk/theora/; revision=18268
----
- lib/decode.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Note: The hunk header was modified from
-
- @@ -400,10 +400,10 @@
-
-to
-
- @@ -397,10 +397,10 @@
-
-to match the source code in the libtheora-1.1.1 tar-ball.
-
-diff --git a/lib/decode.c b/lib/decode.c
-index b803505..9f2516a 100644
---- a/lib/decode.c
-+++ b/lib/decode.c
-@@ -397,10 +397,10 @@ static int oc_dec_init(oc_dec_ctx *_dec,const th_info *_info,
- int qsum;
- qsum=0;
- for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){
-- qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+
-- _dec->state.dequant_tables[qti][pli][qi][17]+
-- _dec->state.dequant_tables[qti][pli][qi][18]+
-- _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);
-+ qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+
-+ _dec->state.dequant_tables[qi][pli][qti][17]+
-+ _dec->state.dequant_tables[qi][pli][qti][18]+
-+ _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);
- }
- _dec->pp_sharp_mod[qi]=-(qsum>>11);
- }
---
-2.10.2
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
deleted file mode 100644
index 46d933323909..000000000000
--- a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/465450
-http://trac.xiph.org/ticket/1947
-
---- a/examples/png2theora.c
-+++ b/examples/png2theora.c
-@@ -462,9 +462,9 @@
- png_set_strip_alpha(png_ptr);
-
- row_data = (png_bytep)png_malloc(png_ptr,
-- 3*height*width*png_sizeof(*row_data));
-+ 3*height*width*sizeof(*row_data));
- row_pointers = (png_bytep *)png_malloc(png_ptr,
-- height*png_sizeof(*row_pointers));
-+ height*sizeof(*row_pointers));
- for(y = 0; y < height; y++) {
- row_pointers[y] = row_data + y*(3*width);
- }
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
deleted file mode 100644
index 7836e3abda23..000000000000
--- a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/504270
-
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -22,7 +22,7 @@
-
- player_example_SOURCES = player_example.c
- player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
--player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS)
-+player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) -lm
-
- encoder_example_SOURCES = encoder_example.c
- EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
-
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
deleted file mode 100644
index a4b577790193..000000000000
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="The Theora Video Compression Codec"
-HOMEPAGE="https://www.theora.org"
-SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc +encode examples static-libs"
-
-REQUIRED_USE="examples? ( encode )" #285895
-
-RDEPEND="
- >=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
- encode? ( >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] )
- examples? (
- media-libs/libpng:0=
- >=media-libs/libsdl-0.11.0
- media-libs/libvorbis:=
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-text/doxygen )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_}
-
-VARTEXFONTS=${T}/fonts
-
-DOCS=( AUTHORS CHANGES README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${P}-libpng16.patch # bug 465450
- "${FILESDIR}"/${P}-fix-UB.patch # bug 620800
-)
-
-src_prepare() {
- default
-
- # bug 467006
- sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
-
- AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
- use x86 && filter-flags -fforce-addr -frename-registers #200549
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
- local myconf=(
- # --disable-spec because LaTeX documentation has been prebuilt
- --disable-spec
- $(use_enable encode)
- $(multilib_native_use_enable examples)
- $(use_enable static-libs static)
- )
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- if multilib_is_native_abi && use examples ; then
- dobin examples/.libs/png2theora
-
- local bin
- for bin in dump_{psnr,video} {encoder,player}_example; do
- newbin examples/.libs/${bin} theora_${bin}
- done
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
-
- einstalldocs
-
- if use examples ; then
- docinto examples
- dodoc examples/*.[ch]
- docompress -x /usr/share/doc/${PF}/examples
- docinto .
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-11 22:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-11 22:32 [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/files/, media-libs/libtheora/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-06-15 2:07 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox