* [gentoo-commits] repo/gentoo:master commit in: media-plugins/libvisual-plugins/files/, media-plugins/libvisual-plugins/
@ 2020-08-01 9:27 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-08-01 9:27 UTC (permalink / raw
To: gentoo-commits
commit: b471613efdd29f68f4304fd6232179a380ca701f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 09:08:59 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 09:26:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b471613e
media-plugins/libvisual-plugins: fixed building with gcc10 and homepage
Bug: https://bugs.gentoo.org/616372
Closes: https://bugs.gentoo.org/708634
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/libvisual-plugins-0.4.0-fno-common.patch | 17 +++++++++++++++++
.../libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild | 3 ++-
.../libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild | 8 ++++++--
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
new file mode 100644
index 00000000000..5544d1895e0
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
@@ -0,0 +1,17 @@
+--- a/plugins/actor/oinksie/table.h
++++ b/plugins/actor/oinksie/table.h
+@@ -27,10 +27,10 @@
+ #define OINK_TABLE_NORMAL_SIZE 1200
+ #define OINK_TABLE_LARGE_SIZE 12000
+
+-float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
+-float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
+
+ void _oink_table_init ();
+
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
index 2ebdcaae9d4..b15a83b81fd 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils ltprune multilib-minimal
PATCHLEVEL=4
DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
-HOMEPAGE="http://libvisual.sourceforge.net/"
+HOMEPAGE="http://libvisual.org/"
SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
mirror://gentoo/${P}-m4-1.tar.bz2"
@@ -37,6 +37,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
src_prepare() {
EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+ epatch "${FILESDIR}/${P}-fno-common.patch"
AT_M4DIR=${WORKDIR}/m4 eautoreconf
sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
index 2ed77031106..8c664230ca5 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils multilib-minimal
PATCHLEVEL=4
DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
-HOMEPAGE="http://libvisual.sourceforge.net/"
+HOMEPAGE="http://libvisual.org/"
SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
mirror://gentoo/${P}-m4-1.tar.bz2"
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
+PATCHES=(
+ "${FILESDIR}/${P}-fno-common.patch"
+)
+
src_prepare() {
# Can't use eapply on ${WORKDIR}/patches since the patches use different
# values for -p. epatch handled that automatically, eapply doesn't
@@ -49,7 +53,7 @@ src_prepare() {
eapply -p1 "${WORKDIR}"/patches/070_all_gforce-fbsd.patch
eapply -p1 "${WORKDIR}"/patches/080_all_qa.patch
eapply -p1 "${WORKDIR}"/patches/090_all_nastyfft.patch
- eapply_user
+ default
AT_M4DIR=${WORKDIR}/m4 eautoreconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/libvisual-plugins/files/, media-plugins/libvisual-plugins/
@ 2020-09-05 10:54 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2020-09-05 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 0b752c3ee0714ca50daa0ea3816f03c1b792863c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 10:53:48 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 10:54:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b752c3e
media-plugins/libvisual-plugins: fixed clang compilation in 0.4.0-r4
Closes: https://bugs.gentoo.org/740304
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/libvisual-plugins-0.4.0-clang.patch | 42 ++++++++++++++++++++++
.../libvisual-plugins-0.4.0-r4.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
new file mode 100644
index 00000000000..25c2880fa0c
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
@@ -0,0 +1,42 @@
+diff --git a/plugins/actor/G-Force/Common/UI/LineXX.cpp b/plugins/actor/G-Force/Common/UI/LineXX.cpp
+index 304eec8..5b18503 100644
+--- a/plugins/actor/G-Force/Common/UI/LineXX.cpp
++++ b/plugins/actor/G-Force/Common/UI/LineXX.cpp
+@@ -74,13 +74,13 @@
+
+
+ #if CLR_INTERP && P_SZ != 1
+- int32_t len = sqrt( dx * dx + dy * dy ) + 1;
++ int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
+ dR /= len;
+ dG /= len;
+ dB /= len;
+ color = __Clr( R, G, B );
+ #elif CLR_INTERP && P_SZ == 1
+- int32_t len = sqrt( dx * dx + dy * dy ) + 1;
++ int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
+ dR /= len;
+ color = __Clr( R, G, B );
+ #endif
+@@ -154,7 +154,7 @@
+
+ for ( j = 0; j < tw; j++ ) {
+ int32_t tmp = j - halfW;
+- c_x = halfW - ( ( int32_t ) sqrt( halfW * halfW - tmp * tmp ) );
++ c_x = halfW - ( ( int32_t ) sqrt( (long double) halfW * halfW - tmp * tmp ) );
+ center = basePtr + (j-halfW) * mBytesPerRow;
+ for ( int k = c_x; k < tw - c_x; k++ ){
+ ((PIXTYPE*) center)[k-halfW] = color;
+diff --git a/plugins/morph/flash/morph_flash.c b/plugins/morph/flash/morph_flash.c
+index fb5308a..c57f490 100644
+--- a/plugins/morph/flash/morph_flash.c
++++ b/plugins/morph/flash/morph_flash.c
+@@ -116,7 +116,7 @@ int lv_morph_flash_palette (VisPluginData *plugin, float rate, VisAudio *audio,
+ FlashPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
+
+ if (src1->pal == NULL || src2->pal == NULL)
+- return;
++ return -1;
+
+ if (rate < 0.5)
+ visual_palette_blend (pal, src1->pal, &priv->whitepal, rate * 2);
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
index 401d8343726..01b17e2e5ae 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
@@ -38,6 +38,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
PATCHES=(
"${FILESDIR}/${P}-fno-common.patch"
+ "${FILESDIR}/${P}-clang.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/libvisual-plugins/files/, media-plugins/libvisual-plugins/
@ 2023-01-24 6:44 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-01-24 6:44 UTC (permalink / raw
To: gentoo-commits
commit: 07bc4db5749954f406e3af52b5555d3edbd6fcd8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:43:58 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 06:44:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bc4db5
media-plugins/libvisual-plugins: dropped obsolete 0.4.0-r4
Bug: https://bugs.gentoo.org/891659
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-plugins/libvisual-plugins/Manifest | 3 -
.../files/libvisual-plugins-0.4.0-clang.patch | 42 -----------
.../files/libvisual-plugins-0.4.0-fno-common.patch | 17 -----
.../libvisual-plugins-0.4.0-r4.ebuild | 84 ----------------------
4 files changed, 146 deletions(-)
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index 610e4abe4b56..d9e9f96971e1 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -1,4 +1 @@
-DIST libvisual-plugins-0.4.0-m4-1.tar.bz2 1872 BLAKE2B 438fa805e4dccde1f446d3e78e6d3578bbf8ada8ab664bc6e408be1a32edacdf4cb587c213300022cece442c63e88258f2d189d0b35dec9ac1a9b8de826a84db SHA512 6522491f0797d0d442e1839fcfad985fcdba4a6d43ec94eb6edf13cea09a0b187b1e7c09b0c3b2f7b8f22d9b41f9cfb1f5b3559fed00b9dc3935fdf37bf7c08a
-DIST libvisual-plugins-0.4.0-patches-4.tar.bz2 10814 BLAKE2B 75e1df7ebbd7455475a9035fe5fd1249117728c74e27ff17407ae9b941bc2e4bfe3cf890ed72bb389a8be27906b7b2ec2dce61403fde8831c127198d663b3666 SHA512 e6c20ebad338c300e1c049d33241daab3d6cd25a73be3402aedb13bb3cf6a84112e074fc2d57f9a7a158d12addd0d320a94d1690ed789f3a90e9cb14cfb966d2
-DIST libvisual-plugins-0.4.0.tar.gz 828631 BLAKE2B a3afdb65b5da4cd19d9793fe8da3b14e99df77e21fb888b9f26b9c60af6b71e331b7250029144cb56281e77d2b579ce45d2be1445cab96bc8dc99dbd40794275 SHA512 f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901
DIST libvisual-plugins-0.4.1.tar.bz2 687994 BLAKE2B 5899580c3b4f5959a5105b79565bd69d87973a38c3d860fb480d88a29846d3017b207ec318ffbd4a2e47382207ccd04cb043a99b68e76f0690cf77fa270e8722 SHA512 db80b081615e129d4bea34c7d99af1978bd1b569f4a1f17cfbbe3cadafc954085552c5944198f9c86f43aa367460d3ca5b4e4ea2aacee4f78dce9ff802a80663
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
deleted file mode 100644
index 25c2880fa0c5..000000000000
--- a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-clang.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/plugins/actor/G-Force/Common/UI/LineXX.cpp b/plugins/actor/G-Force/Common/UI/LineXX.cpp
-index 304eec8..5b18503 100644
---- a/plugins/actor/G-Force/Common/UI/LineXX.cpp
-+++ b/plugins/actor/G-Force/Common/UI/LineXX.cpp
-@@ -74,13 +74,13 @@
-
-
- #if CLR_INTERP && P_SZ != 1
-- int32_t len = sqrt( dx * dx + dy * dy ) + 1;
-+ int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
- dR /= len;
- dG /= len;
- dB /= len;
- color = __Clr( R, G, B );
- #elif CLR_INTERP && P_SZ == 1
-- int32_t len = sqrt( dx * dx + dy * dy ) + 1;
-+ int32_t len = sqrt( (long double) dx * dx + dy * dy ) + 1;
- dR /= len;
- color = __Clr( R, G, B );
- #endif
-@@ -154,7 +154,7 @@
-
- for ( j = 0; j < tw; j++ ) {
- int32_t tmp = j - halfW;
-- c_x = halfW - ( ( int32_t ) sqrt( halfW * halfW - tmp * tmp ) );
-+ c_x = halfW - ( ( int32_t ) sqrt( (long double) halfW * halfW - tmp * tmp ) );
- center = basePtr + (j-halfW) * mBytesPerRow;
- for ( int k = c_x; k < tw - c_x; k++ ){
- ((PIXTYPE*) center)[k-halfW] = color;
-diff --git a/plugins/morph/flash/morph_flash.c b/plugins/morph/flash/morph_flash.c
-index fb5308a..c57f490 100644
---- a/plugins/morph/flash/morph_flash.c
-+++ b/plugins/morph/flash/morph_flash.c
-@@ -116,7 +116,7 @@ int lv_morph_flash_palette (VisPluginData *plugin, float rate, VisAudio *audio,
- FlashPrivate *priv = visual_object_get_private (VISUAL_OBJECT (plugin));
-
- if (src1->pal == NULL || src2->pal == NULL)
-- return;
-+ return -1;
-
- if (rate < 0.5)
- visual_palette_blend (pal, src1->pal, &priv->whitepal, rate * 2);
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
deleted file mode 100644
index 5544d1895e02..000000000000
--- a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/plugins/actor/oinksie/table.h
-+++ b/plugins/actor/oinksie/table.h
-@@ -27,10 +27,10 @@
- #define OINK_TABLE_NORMAL_SIZE 1200
- #define OINK_TABLE_LARGE_SIZE 12000
-
--float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
--float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
--float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
--float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
-+extern float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
-+extern float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
-+extern float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
-+extern float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
-
- void _oink_table_init ();
-
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
deleted file mode 100644
index 4e68ce53d0ee..000000000000
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-PATCHLEVEL=4
-
-DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
-HOMEPAGE="http://libvisual.org/"
-SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
- mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
- mirror://gentoo/${P}-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="alsa debug gtk jack mplayer opengl"
-
-RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- ~media-libs/libvisual-${PV}[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- )"
-BDEPEND=">=virtual/pkgconfig-0-r1"
-
-DEPEND="${RDEPEND}
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-PATCHES=(
- "${FILESDIR}/${P}-fno-common.patch"
- "${FILESDIR}/${P}-clang.patch"
-)
-
-src_prepare() {
- # Can't use eapply on ${WORKDIR}/patches since the patches use different
- # values for -p. epatch handled that automatically, eapply doesn't
- eapply -p1 "${WORKDIR}"/patches/005_all_cxxflags.patch
- eapply -p1 "${WORKDIR}"/patches/010_all_LIBADD.patch
- eapply -p1 "${WORKDIR}"/patches/020_all_64bit.patch
- eapply -p1 "${WORKDIR}"/patches/030_all_analyser.patch
- eapply -p1 "${WORKDIR}"/patches/040_all_gforce.patch
- eapply -p0 "${WORKDIR}"/patches/050_all_automagic.patch
- eapply -p0 "${WORKDIR}"/patches/060_all_gstreamer.patch
- eapply -p1 "${WORKDIR}"/patches/070_all_gforce-fbsd.patch
- eapply -p1 "${WORKDIR}"/patches/080_all_qa.patch
- eapply -p1 "${WORKDIR}"/patches/090_all_nastyfft.patch
- default
-
- AT_M4DIR=${WORKDIR}/m4 eautoreconf
-
- sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-esd \
- $(use_enable jack) \
- $(use_enable gtk gdkpixbuf-plugin) \
- --disable-gstreamer-plugin \
- $(use_enable alsa) \
- $(use_enable mplayer) \
- $(use_enable debug inputdebug) \
- $(use_enable opengl gltest) \
- $(use_enable opengl nastyfft) \
- $(use_enable opengl madspin) \
- $(use_enable opengl flower) \
- $(use_enable debug)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name "*.la" -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-24 6:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-24 6:44 [gentoo-commits] repo/gentoo:master commit in: media-plugins/libvisual-plugins/files/, media-plugins/libvisual-plugins/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2020-09-05 10:54 Miroslav Šulc
2020-08-01 9:27 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox