* [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisual/files/, media-libs/libvisual/
@ 2021-01-24 16:28 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-01-24 16:28 UTC (permalink / raw
To: gentoo-commits
commit: e563243979926f3f8d1404df5bc1df684cd82dde
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 16:28:22 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 16:28:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5632439
media-libs/libvisual: Port to EAPI 7
Closes: https://bugs.gentoo.org/517578
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../libvisual-0.4.0-better-altivec-detection.patch | 4 +-
.../files/libvisual-0.4.0-format-security.patch | 16 +++++++
.../libvisual-0.4.0-inlinedefineconflict.patch | 12 +++---
media-libs/libvisual/libvisual-0.4.0-r3.ebuild | 50 ++++++++++++----------
4 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
index 19aa579aa11..ca34558549d 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-better-altivec-detection.patch
@@ -1,7 +1,7 @@
http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
---- libvisual/lv_cpu.c
-+++ libvisual/lv_cpu.c
+--- a/libvisual/lv_cpu.c
++++ b/libvisual/lv_cpu.c
@@ -50,8 +50,19 @@
#endif
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
new file mode 100644
index 00000000000..91ff1c72733
--- /dev/null
+++ b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
@@ -0,0 +1,16 @@
+--- a/libvisual/lv_plugin.c
++++ b/libvisual/lv_plugin.c
+@@ -442,11 +442,11 @@
+
+ visual_list_add (list, ref);
+ } else if (ret != FALSE) {
+- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ }
+ }
+ else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */
+- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
++ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
+ }
+ }
+
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
index 5d04f30335a..9267c5a954c 100644
--- a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
+++ b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
@@ -1,7 +1,7 @@
http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
---- libvisual/lv_cache.c
-+++ libvisual/lv_cache.c
+--- a/libvisual/lv_cache.c
++++ b/libvisual/lv_cache.c
@@ -32,7 +32,7 @@
static int cache_dtor (VisObject *object);
static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
@@ -20,8 +20,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
{
VisCacheEntry *centry;
---- libvisual/lv_defines.h
-+++ libvisual/lv_defines.h
+--- a/libvisual/lv_defines.h
++++ b/libvisual/lv_defines.h
@@ -63,13 +63,13 @@
/* Compiler specific optimalization macros */
@@ -38,8 +38,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
# define __malloc /* no malloc */
# define __packed /* no packed */
# define VIS_LIKELY(x) (x)
---- libvisual/lv_time.h
-+++ libvisual/lv_time.h
+--- a/libvisual/lv_time.h
++++ b/libvisual/lv_time.h
@@ -101,7 +101,7 @@
*
* @return Nothing.
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index 50f3ac50b8e..f6880e33b6c 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,27 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-AUTOTOOLS_AUTORECONF=1
+inherit autotools multilib-minimal
-inherit autotools-multilib
-
-DESCRIPTION="Libvisual is an abstraction library that comes between applications and audio visualisation plugins"
+DESCRIPTION="Abstraction library between applications and audio visualisation plugins"
HOMEPAGE="http://libvisual.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0.4"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug nls static-libs threads"
-
-DEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
+IUSE="debug nls threads"
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${P}-better-altivec-detection.patch
@@ -29,24 +24,33 @@ PATCHES=(
"${FILESDIR}"/${P}-conditions.patch
"${FILESDIR}"/${P}-detect_amd64.patch
"${FILESDIR}"/${P}-cond.patch
- )
+ "${FILESDIR}"/${P}-format-security.patch
+)
MULTILIB_WRAPPED_HEADERS=(
/usr/include/libvisual-0.4/libvisual/lvconfig.h
)
src_prepare() {
- autotools-multilib_src_prepare
+ default
+
# autogenerated, causes problems for out of tree builds
- rm -f libvisual/lvconfig.h || die
+ rm libvisual/lvconfig.h || die
+
+ eautoreconf
}
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable nls)
- $(use_enable threads)
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-static \
+ $(use_enable nls) \
+ $(use_enable threads) \
$(use_enable debug)
- )
- autotools-multilib_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisual/files/, media-libs/libvisual/
@ 2023-01-24 6:44 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2023-01-24 6:44 UTC (permalink / raw
To: gentoo-commits
commit: e8269ebcf8272cfa1d9d24e6fff87aba2cc2a2d0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:42:34 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=e8269ebc
media-libs/libvisual: dropped obsolete 0.4.0-r4
Bug: https://bugs.gentoo.org/891659
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/libvisual/Manifest | 1 -
.../libvisual/files/libvisual-0.4.0-cond.patch | 15 ------
.../files/libvisual-0.4.0-conditions.patch | 24 ---------
.../files/libvisual-0.4.0-detect_amd64.patch | 14 -----
.../files/libvisual-0.4.0-format-security.patch | 16 ------
.../libvisual-0.4.0-inlinedefineconflict.patch | 60 ----------------------
media-libs/libvisual/libvisual-0.4.0-r4.ebuild | 56 --------------------
7 files changed, 186 deletions(-)
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index a4726a135150..a9fe47948878 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -1,2 +1 @@
-DIST libvisual-0.4.0.tar.bz2 430496 BLAKE2B 068b06ca90dc6b80f5f4bb748962906314341639b26792aa370e834ba1053f3eacdf330c2f59cc6d809b689e50349079b5c6e2331fc1b4594e75decae4b90d3a SHA512 9157f4bcb8b3ba88dea3620ca6dfefdb06322fd46dd16ba893336513e0f27caad22a93639ceb42349faa9b168f0e5f2b202c9b2b5abcfa2f58554a7515941bf4
DIST libvisual-0.4.1.tar.bz2 560877 BLAKE2B 5429493424cbf7d5d6e17ef6a5219ffb5491a6e0f7ea9d9563021beabfdc22aead0d80924c17904b96cc645ef0dc737fa61680abf152b421ca5f4ac834fc6a19 SHA512 a1417a54d4f0566121db5d08770e7f41559ef7f3704d0da74f1dc316c6b7f16197d843a96382b4122d01251764ccb6ed240fd4e99abc7b0f440c9f43afa9506a
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-cond.patch b/media-libs/libvisual/files/libvisual-0.4.0-cond.patch
deleted file mode 100644
index e1a3efd47418..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-cond.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Broken --enable/disable condition.
-
-Index: libvisual-0.4.0/configure.ac
-===================================================================
---- libvisual-0.4.0.orig/configure.ac
-+++ libvisual-0.4.0/configure.ac
-@@ -191,7 +191,7 @@ AIX_COMPILE_INFO="AIX's C compiler needs
- with the right compiler. Ususally just '_r' is appended
- to the compiler name."
-
--AC_ARG_ENABLE([enable_threads],
-+AC_ARG_ENABLE([threads],
- AC_HELP_STRING([--enable-threads],
- [Turn on basic thread support @<:@default=enabled@:>@]),
- [enable_threads=$enableval],
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch b/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch
deleted file mode 100644
index 1520db2eac5e..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-conditions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=431066
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456856
-
-diff -u libvisual-0.4.0/libvisual/lv_cpu.c libvisual-0.4.0/libvisual/lv_cpu.c
---- libvisual-0.4.0/libvisual/lv_cpu.c
-+++ libvisual-0.4.0/libvisual/lv_cpu.c
-@@ -76,7 +76,7 @@
-
- /* The sigill handlers */
- #if defined(VISUAL_ARCH_X86) //x86 (linux katmai handler check thing)
--#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
-+#if defined(VISUAL_OS_LINUX) && defined(_POSIX_SOURCE)
- static void sigill_handler_sse( int signal, struct sigcontext sc )
- {
- /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
-@@ -109,7 +109,7 @@
- }
- }
- #endif
--#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#endif /* VISUAL_OS_LINUX && _POSIX_SOURCE */
-
- #if defined(VISUAL_OS_WIN32)
- LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch b/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch
deleted file mode 100644
index a796acce3b07..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-detect_amd64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Needed so that lvconfig.h gets the correct define for amd64.
-
-Index: libvisual-0.4.0/configure.ac
-===================================================================
---- libvisual-0.4.0.orig/configure.ac
-+++ libvisual-0.4.0/configure.ac
-@@ -780,6 +780,7 @@ echo >>$outfile
- lv_alpha=$lv_alpha
- lv_sparc=$lv_sparc
- lv_ix86=$lv_ix86
-+ lv_x86_64=$lv_x86_64
- lv_powerpc=$lv_powerpc
- lv_arch_unknown=$lv_arch_unknown
-
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch b/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
deleted file mode 100644
index 91ff1c727335..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libvisual/lv_plugin.c
-+++ b/libvisual/lv_plugin.c
-@@ -442,11 +442,11 @@
-
- visual_list_add (list, ref);
- } else if (ret != FALSE) {
-- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
-+ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
- }
- }
- else if (ret != FALSE) { /* FIXME XXX TODO, patch frmo duilio check how this works */
-- visual_log (VISUAL_LOG_WARNING, visual_error_to_string (ret));
-+ visual_log (VISUAL_LOG_WARNING, "%s", visual_error_to_string (ret));
- }
- }
-
diff --git a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch b/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
deleted file mode 100644
index 9267c5a954c5..000000000000
--- a/media-libs/libvisual/files/libvisual-0.4.0-inlinedefineconflict.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=libvisual.git;a=tree
-
---- a/libvisual/lv_cache.c
-+++ b/libvisual/lv_cache.c
-@@ -32,7 +32,7 @@
- static int cache_dtor (VisObject *object);
- static int cache_remove_list_entry (VisCache *cache, VisListEntry **le);
-
--static inline void handle_request_reset (VisCache *cache, VisListEntry *le);
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le);
-
- static int cache_dtor (VisObject *object)
- {
-@@ -74,7 +74,7 @@
- }
-
-
--static inline void handle_request_reset (VisCache *cache, VisListEntry *le)
-+static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le)
- {
- VisCacheEntry *centry;
-
---- a/libvisual/lv_defines.h
-+++ b/libvisual/lv_defines.h
-@@ -63,13 +63,13 @@
-
- /* Compiler specific optimalization macros */
- #if __GNUC__ >= 3
--# define inline inline __attribute__ ((always_inline))
-+# define lv_inline inline __attribute__ ((always_inline))
- # define __malloc __attribute__ ((malloc))
- # define __packed __attribute__ ((packed))
- # define VIS_LIKELY(x) __builtin_expect (!!(x), 1)
- # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0)
- #else
--# define inline /* no inline */
-+# define lv_inline /* no inline */
- # define __malloc /* no malloc */
- # define __packed /* no packed */
- # define VIS_LIKELY(x) (x)
---- a/libvisual/lv_time.h
-+++ b/libvisual/lv_time.h
-@@ -101,7 +101,7 @@
- *
- * @return Nothing.
- */
--static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
-+static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi)
- {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- __asm __volatile
-@@ -115,7 +115,7 @@
- }
-
- /* FIXME use uint64_t here, make sure type exists */
--static inline unsigned long long visual_timer_tsc_get_returned ()
-+static lv_inline unsigned long long visual_timer_tsc_get_returned ()
- {
- uint32_t lo, hi;
-
diff --git a/media-libs/libvisual/libvisual-0.4.0-r4.ebuild b/media-libs/libvisual/libvisual-0.4.0-r4.ebuild
deleted file mode 100644
index eed9f114fc7f..000000000000
--- a/media-libs/libvisual/libvisual-0.4.0-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Abstraction library between applications and audio visualisation plugins"
-HOMEPAGE="http://libvisual.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug nls threads"
-
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-better-altivec-detection.patch
- "${FILESDIR}"/${P}-inlinedefineconflict.patch
- "${FILESDIR}"/${P}-conditions.patch
- "${FILESDIR}"/${P}-detect_amd64.patch
- "${FILESDIR}"/${P}-cond.patch
- "${FILESDIR}"/${P}-format-security.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libvisual-0.4/libvisual/lvconfig.h
-)
-
-src_prepare() {
- default
-
- # autogenerated, causes problems for out of tree builds
- rm libvisual/lvconfig.h || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-static \
- $(use_enable nls) \
- $(use_enable threads) \
- $(use_enable debug)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-24 6:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 16:28 [gentoo-commits] repo/gentoo:master commit in: media-libs/libvisual/files/, media-libs/libvisual/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-01-24 6:44 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox