summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicola Murino2021-06-02 12:26:44 +0200
committerNicola Murino2021-06-02 12:26:44 +0200
commit3e0e714a70c1d284f46c5d556602a1be81d620fb (patch)
tree7f7549ed020f6dc8708cf619554dde7a0ed76318
parenteaa2439ae3ae4791a93b458ec236fadc12c1124d (diff)
downloadaur-mingw-w64-libvisual.tar.gz
fix build with gcc 11
-rw-r--r--.SRCINFO7
-rw-r--r--0001-fix-printf-format.patch66
-rw-r--r--PKGBUILD5
3 files changed, 73 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1ef6904100..c096ba37637 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jan 16 21:55:00 UTC 2017
pkgbase = mingw-w64-libvisual
pkgdesc = Abstraction library that comes between applications and audio visualisation plugins (mingw-w64)
pkgver = 0.4.0
- pkgrel = 1
+ pkgrel = 2
url = http://sourceforge.net/projects/libvisual/
arch = any
license = LGPL
@@ -13,6 +11,7 @@ pkgbase = mingw-w64-libvisual
options = !buildflags
options = staticlibs
source = http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-0.4.0.tar.gz
+ source = 0001-fix-printf-format.patch
source = 0003-Add-long-long-check-for-win64.patch
source = 0005-Fix-compilation-in-win64.patch
source = 0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch
@@ -24,6 +23,7 @@ pkgbase = mingw-w64-libvisual
source = 0015-Include-lv_cpu.h-in-another-place-too.patch
source = 0016-configure.ac-Use-gettext-0.19.patch
sha256sums = 0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
+ sha256sums = dc0f3d97df9d18702a57fa9567c8c1539d8d61328e1734ccd724e442d8fe1edb
sha256sums = ad26dc477e09e1cdc28a29e4d1bc7d45ae3db7741d38a1bd56bccfef96bcefaa
sha256sums = f5e3eb5e7b2993618be9ac034ac7ac943fb68d3db1cde05f60f406b22666a8b6
sha256sums = 4c8ec4b57fe6d795c822587657f7cf82db33013910f27e8df473138b86b3c183
@@ -36,4 +36,3 @@ pkgbase = mingw-w64-libvisual
sha256sums = 1607465d32962af516e815295d5c0800745b369b41a767e92e134cf0488c52f1
pkgname = mingw-w64-libvisual
-
diff --git a/0001-fix-printf-format.patch b/0001-fix-printf-format.patch
new file mode 100644
index 00000000000..d351ba86722
--- /dev/null
+++ b/0001-fix-printf-format.patch
@@ -0,0 +1,66 @@
+From 83241efb85f7d75d37da0a6f001b88641943abc2 Mon Sep 17 00:00:00 2001
+From: Nicola Murino <nicola.murino@gmail.com>
+Date: Wed, 2 Jun 2021 12:24:08 +0200
+Subject: [PATCH] fix printf format
+
+---
+ libvisual/lv_plugin.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libvisual/lv_plugin.c b/libvisual/lv_plugin.c
+index 123b4c6..c278b16 100644
+--- a/libvisual/lv_plugin.c
++++ b/libvisual/lv_plugin.c
+@@ -442,11 +442,11 @@ VisList *visual_plugin_registry_filter (VisList *pluglist, const char *domain)
+
+ 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));
+ }
+ }
+
+@@ -720,7 +720,7 @@ VisPluginData *visual_plugin_load (VisPluginRef *ref)
+
+ if (handle == NULL) {
+ #if defined(VISUAL_OS_WIN32)
+- visual_log (VISUAL_LOG_CRITICAL, "Cannot load plugin: win32 error code: %d", GetLastError ());
++ visual_log (VISUAL_LOG_CRITICAL, "Cannot load plugin: win32 error code: %ld", GetLastError ());
+ #else
+ visual_log (VISUAL_LOG_CRITICAL, _("Cannot load plugin: %s"), dlerror ());
+ #endif
+@@ -735,7 +735,7 @@ VisPluginData *visual_plugin_load (VisPluginRef *ref)
+
+ if (get_plugin_info == NULL) {
+ #if defined(VISUAL_OS_WIN32)
+- visual_log (VISUAL_LOG_CRITICAL, "Cannot initialize plugin: win32 error code: %d", GetLastError ());
++ visual_log (VISUAL_LOG_CRITICAL, "Cannot initialize plugin: win32 error code: %ld", GetLastError ());
+
+ FreeLibrary (handle);
+ #else
+@@ -837,7 +837,7 @@ VisPluginRef **visual_plugin_get_references (const char *pluginpath, int *count)
+
+ if (handle == NULL) {
+ #if defined(VISUAL_OS_WIN32)
+- visual_log (VISUAL_LOG_CRITICAL, "Cannot load plugin: win32 error code: %d", GetLastError());
++ visual_log (VISUAL_LOG_CRITICAL, "Cannot load plugin: win32 error code: %ld", GetLastError());
+ #else
+ visual_log (VISUAL_LOG_CRITICAL, _("Cannot load plugin: %s"), dlerror ());
+ #endif
+@@ -872,7 +872,7 @@ VisPluginRef **visual_plugin_get_references (const char *pluginpath, int *count)
+
+ if (get_plugin_info == NULL) {
+ #if defined(VISUAL_OS_WIN32)
+- visual_log (VISUAL_LOG_CRITICAL, "Cannot initialize plugin: win32 error code: %d", GetLastError ());
++ visual_log (VISUAL_LOG_CRITICAL, "Cannot initialize plugin: win32 error code: %ld", GetLastError ());
+
+ FreeLibrary (handle);
+ #else
+--
+2.31.1
+
diff --git a/PKGBUILD b/PKGBUILD
index a6984211c87..9c9ef45cd7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: drakkan <nicola.murino at gmail dot com>
pkgname=mingw-w64-libvisual
pkgver=0.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Abstraction library that comes between applications and audio visualisation plugins (mingw-w64)"
arch=('any')
url="http://sourceforge.net/projects/libvisual/"
@@ -10,6 +10,7 @@ makedepends=('mingw-w64-configure')
depends=('mingw-w64-crt')
options=('!strip' '!buildflags' 'staticlibs')
source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz"
+ "0001-fix-printf-format.patch"
"0003-Add-long-long-check-for-win64.patch"
"0005-Fix-compilation-in-win64.patch"
"0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch"
@@ -21,6 +22,7 @@ source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgv
"0015-Include-lv_cpu.h-in-another-place-too.patch"
"0016-configure.ac-Use-gettext-0.19.patch")
sha256sums=('0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7'
+ 'dc0f3d97df9d18702a57fa9567c8c1539d8d61328e1734ccd724e442d8fe1edb'
'ad26dc477e09e1cdc28a29e4d1bc7d45ae3db7741d38a1bd56bccfef96bcefaa'
'f5e3eb5e7b2993618be9ac034ac7ac943fb68d3db1cde05f60f406b22666a8b6'
'4c8ec4b57fe6d795c822587657f7cf82db33013910f27e8df473138b86b3c183'
@@ -36,6 +38,7 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
prepare() {
cd "libvisual-$pkgver"
+ patch -Np1 -i "$srcdir/0001-fix-printf-format.patch"
patch -Np1 -i "$srcdir/0003-Add-long-long-check-for-win64.patch"
patch -Np1 -i "$srcdir/0005-Fix-compilation-in-win64.patch"
patch -Np1 -i "$srcdir/0008-Remove-malloc-realloc-configure-checks-they-re-broke.patch"