summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-11-23 03:29:38 +0000
committerSam James <sam@gentoo.org>2022-11-23 03:29:38 +0000
commit265a9a1fd14588b70e669e1ee5407d766618a321 (patch)
tree1b3767f32f7a79b53899ab638654aebc465f3f52 /media-libs/libvorbis
parentmedia-libs/libogg: EAPI 8, fix -Wstrict-prototypes in configure (diff)
downloadgentoo-265a9a1fd14588b70e669e1ee5407d766618a321.tar.gz
gentoo-265a9a1fd14588b70e669e1ee5407d766618a321.tar.bz2
gentoo-265a9a1fd14588b70e669e1ee5407d766618a321.zip
media-libs/libvorbis: EAPI 8, fix -Wstrict-prototypes in configure
We may well have people proactively trying to use it and it's cheap to fix & build. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/libvorbis')
-rw-r--r--media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch20
-rw-r--r--media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild (renamed from media-libs/libvorbis/libvorbis-1.3.7.ebuild)10
2 files changed, 26 insertions, 4 deletions
diff --git a/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch b/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch
new file mode 100644
index 000000000000..24e163d5adf8
--- /dev/null
+++ b/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch
@@ -0,0 +1,20 @@
+https://gitlab.xiph.org/xiph/vorbis/-/merge_requests/25
+
+From 63132c52ee4694171f663ecf536ab1236b6c46ba Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 03:27:44 +0000
+Subject: [PATCH] vorbis.m4: fix -Wstrict-prototypes
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vorbis.m4
++++ b/vorbis.m4
+@@ -67,7 +67,7 @@ dnl
+ #include <vorbis/codec.h>
+ #include <vorbis/vorbisenc.h>
+
+-int main ()
++int main (void)
+ {
+ vorbis_block vb;
+ vorbis_dsp_state vd;
+GitLab
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
index 9b1d80665e32..f90fe66fd547 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit autotools multilib-minimal
DESCRIPTION="The Ogg Vorbis sound file format library"
@@ -16,11 +17,13 @@ IUSE="static-libs test"
RESTRICT="!test? ( test )"
BDEPEND="virtual/pkgconfig"
-
RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
-
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.7-macro-wstrict-prototypes.patch
+)
+
src_prepare() {
default
@@ -46,7 +49,6 @@ multilib_src_configure() {
$(use_enable test oggtest)
)
- einfo "Running configure in ${BUILD_DIR}"
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}