[arch-commits] Commit in sonic-visualiser/trunk (2 files)
David Runge
dvzrv at archlinux.org
Thu Dec 12 16:11:17 UTC 2019
Date: Thursday, December 12, 2019 @ 16:11:16
Author: dvzrv
Revision: 537403
upgpkg: sonic-visualiser 4.0.1-1
Upgrading to 4.0.1. Adding all direct library dependencies.
Adding patch to remove all use of -Werror. Removing unecessary exports and comments.
Added:
sonic-visualiser/trunk/sonic-visualiser-4.0.1-remove-werror.patch
Modified:
sonic-visualiser/trunk/PKGBUILD
--------------------------------------------+
PKGBUILD | 43 +++----
sonic-visualiser-4.0.1-remove-werror.patch | 149 +++++++++++++++++++++++++++
2 files changed, 168 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-12 15:53:03 UTC (rev 537402)
+++ PKGBUILD 2019-12-12 16:11:16 UTC (rev 537403)
@@ -2,32 +2,36 @@
# Contributor: speps <speps at aur dot archlinux dot org>
# Contributor: Orivej Desh <masecretaire at gmx.fr>
-_download_id=2580
+_download_id=2607
pkgname=sonic-visualiser
-pkgver=4.0
-pkgrel=2
+pkgver=4.0.1
+pkgrel=1
pkgdesc="A viewer and analyser of music audio files."
arch=('x86_64')
url="https://www.sonicvisualiser.org/"
license=('GPL2')
groups=('pro-audio')
-depends=('capnproto' 'desktop-file-utils' 'hicolor-icon-theme' 'libfishsound'
-'libid3tag' 'liblo' 'liblrdf' 'libmad' 'liboggz' 'libpulse' 'opusfile'
-'portaudio' 'qt5-svg' 'rubberband' 'sord')
-source=("https://code.soundsoftware.ac.uk/attachments/download/${_download_id}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('3066cdd785a8eaf0117aab8500a9c56f6b6bd6666b8956fbdb19e59be120badb0a5ad982b8e0bbd4da24b5db9ef69b007ec9c44c38d2a7b5b7ef0a2d89a5cb80')
+depends=('alsa-lib' 'bzip2' 'desktop-file-utils' 'fftw' 'gcc-libs' 'glibc'
+'hicolor-icon-theme' 'libcapnp.so' 'libfishsound.so' 'libid3tag' 'libkj.so'
+'liblo.so' 'liblrdf.so' 'libmad' 'liboggz.so' 'libportaudio.so' 'libpulse'
+'librubberband.so' 'libsamplerate' 'libserd-0.so' 'libsndfile' 'libsord-0.so'
+'opusfile' 'qt5-base' 'qt5-svg')
+source=("https://code.soundsoftware.ac.uk/attachments/download/${_download_id}/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}-4.0.1-remove-werror.patch"
+)
+sha512sums=('6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220'
+ '1b5873953ec8635a1e10f924cfc2aa8dcdfa856dfcf2b4a06e8f1ab8ed947697e64f3c20147464dcc95b1d836e92e848c57c6480bd04a9d2086547044df606da')
prepare() {
cd "${pkgname}-${pkgver}"
+ # remove all declarations of -Werror
+ # https://sourceforge.net/p/sv1/bugs/277/
+ patch -Np1 -i "../${pkgname}-4.0.1-remove-werror.patch"
autoreconf -vfi
}
build() {
cd "${pkgname}-${pkgver}"
- # DESTDIR still ignored
- # https://sourceforge.net/p/sv1/bugs/254
- export INSTALL_ROOT="${pkgdir}/"
- export LIBS="$(pkgconf --libs rubberband) ${LIBS}"
./configure --prefix=/usr
make
}
@@ -34,19 +38,10 @@
package() {
cd "${pkgname}-${pkgver}"
- # DESTDIR still ignored
+ # INSTALL_ROOT used in favor of DESTDIR
# https://sourceforge.net/p/sv1/bugs/254
- export INSTALL_ROOT="${pkgdir}/"
-
- make install
- # install some things separately, because build system is broken:
- # https://sourceforge.net/p/sv1/bugs/247/
-
- # not all binaries are actually executable:
- # https://bugs.archlinux.org/task/64449
- chmod 755 "${pkgdir}/usr/bin/"*
-
- # desktop files
+ make INSTALL_ROOT="${pkgdir}/" install
+ # xdg desktop file
install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
# samples
install -vDm 644 samples/* -t "${pkgdir}/usr/share/${pkgname}/samples"
Added: sonic-visualiser-4.0.1-remove-werror.patch
===================================================================
--- sonic-visualiser-4.0.1-remove-werror.patch (rev 0)
+++ sonic-visualiser-4.0.1-remove-werror.patch 2019-12-12 16:11:16 UTC (rev 537403)
@@ -0,0 +1,149 @@
+diff -ruN a/bqfft/build/Makefile.inc b/bqfft/build/Makefile.inc
+--- a/bqfft/build/Makefile.inc 2019-12-10 10:29:35.000000000 +0100
++++ b/bqfft/build/Makefile.inc 2019-12-12 15:14:52.369303949 +0100
+@@ -14,7 +14,7 @@
+
+ OPTFLAGS ?= -O3 -ffast-math
+
+-CXXFLAGS ?= -std=c++98 -Wall -Wextra -Werror $(FFT_DEFINES) $(VECTOR_DEFINES) $(ALLOCATOR_DEFINES) $(OPTFLAGS) -I. $(THIRD_PARTY_INCLUDES) -I../bqvec -fpic
++CXXFLAGS ?= -std=c++98 -Wall -Wextra $(FFT_DEFINES) $(VECTOR_DEFINES) $(ALLOCATOR_DEFINES) $(OPTFLAGS) -I. $(THIRD_PARTY_INCLUDES) -I../bqvec -fpic
+
+ LIBRARY := libbqfft.a
+
+diff -ruN a/bqresample/build/Makefile.inc b/bqresample/build/Makefile.inc
+--- a/bqresample/build/Makefile.inc 2019-12-10 10:29:37.000000000 +0100
++++ b/bqresample/build/Makefile.inc 2019-12-12 15:15:19.425731836 +0100
+@@ -15,7 +15,7 @@
+
+ OPTFLAGS ?= -O3 -ffast-math
+
+-CXXFLAGS ?= -std=c++98 -fpic -Wall -Wextra -Werror $(RESAMPLE_DEFINES) $(VECTOR_DEFINES) $(ALLOCATOR_DEFINES) $(OPTFLAGS) -I. $(THIRD_PARTY_INCLUDES) -I../bqvec
++CXXFLAGS ?= -std=c++98 -fpic -Wall -Wextra $(RESAMPLE_DEFINES) $(VECTOR_DEFINES) $(ALLOCATOR_DEFINES) $(OPTFLAGS) -I. $(THIRD_PARTY_INCLUDES) -I../bqvec
+
+ CFLAGS := -fpic -Wall -Wextra $(RESAMPLE_DEFINES) $(VECTOR_DEFINES) $(ALLOCATOR_DEFINES) $(OPTFLAGS) -I. $(THIRD_PARTY_INCLUDES)
+
+diff -ruN a/checker/checker.pri b/checker/checker.pri
+--- a/checker/checker.pri 2019-12-10 10:29:25.000000000 +0100
++++ b/checker/checker.pri 2019-12-12 15:12:42.627107945 +0100
+@@ -2,10 +2,6 @@
+ CONFIG += qt stl c++11 exceptions console warn_on
+ QT -= xml network gui widgets
+
+-!win32 {
+- QMAKE_CXXFLAGS += -Werror
+-}
+-
+ OBJECTS_DIR = o
+ MOC_DIR = o
+
+diff -ruN a/checker/helper.pro b/checker/helper.pro
+--- a/checker/helper.pro 2019-12-10 10:29:25.000000000 +0100
++++ b/checker/helper.pro 2019-12-12 15:13:00.130288658 +0100
+@@ -10,10 +10,6 @@
+
+ macx*: CONFIG -= app_bundle
+
+-!win32* {
+- QMAKE_CXXFLAGS += -Werror
+-}
+-
+ linux* {
+ LIBS += -ldl
+ }
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac 2019-12-10 10:29:11.000000000 +0100
++++ b/configure.ac 2019-12-12 15:11:29.904405648 +0100
+@@ -57,7 +57,7 @@
+
+ if test "x$GCC" = "xyes"; then
+ CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+- CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
++ CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+ OPTFLAGS_DEBUG="-O2"
+ CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
+ OPTFLAGS_RELEASE="-O3 -ffast-math"
+diff -ruN a/dataquay/config.pri b/dataquay/config.pri
+--- a/dataquay/config.pri 2019-12-10 10:29:32.000000000 +0100
++++ b/dataquay/config.pri 2019-12-12 15:15:30.962296540 +0100
+@@ -8,6 +8,6 @@
+
+ # Define this to use the Sord datastore (http://drobilla.net/software/sord/)
+ #DEFINES += USE_SORD
+-#QMAKE_CXXFLAGS += -I/usr/include/sord-0 -I/usr/include/serd-0 -Werror
++#QMAKE_CXXFLAGS += -I/usr/include/sord-0 -I/usr/include/serd-0
+ #EXTRALIBS += -lsord-0 -lserd-0
+
+diff -ruN a/piper-vamp-cpp/Makefile b/piper-vamp-cpp/Makefile
+--- a/piper-vamp-cpp/Makefile 2019-12-10 10:29:29.000000000 +0100
++++ b/piper-vamp-cpp/Makefile 2019-12-12 15:13:45.643223896 +0100
+@@ -7,7 +7,7 @@
+ OPTFLAGS := -O3 -fPIC
+
+ CFLAGS := -Wall -std=c99 $(OPTFLAGS) $(INCFLAGS)
+-CXXFLAGS := -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++1y $(OPTFLAGS) $(INCFLAGS)
++CXXFLAGS := -Wall -Wextra -Wno-error=unused-parameter -std=c++1y $(OPTFLAGS) $(INCFLAGS)
+
+ CXX ?= c++
+
+diff -ruN a/piper-vamp-cpp/ext/json11/CMakeLists.txt b/piper-vamp-cpp/ext/json11/CMakeLists.txt
+--- a/piper-vamp-cpp/ext/json11/CMakeLists.txt 2019-12-10 10:29:29.000000000 +0100
++++ b/piper-vamp-cpp/ext/json11/CMakeLists.txt 2019-12-12 15:14:32.436146202 +0100
+@@ -29,7 +29,7 @@
+
+ # Set warning flags, which may vary per platform
+ include(CheckCXXCompilerFlag)
+-set(_possible_warnings_flags /W4 /WX -Wextra -Werror)
++set(_possible_warnings_flags /W4 /WX -Wextra)
+ foreach(_warning_flag in ${_possible_warnings_flags})
+ CHECK_CXX_COMPILER_FLAG(_warning_flag _flag_supported)
+ if(${_flag_supported})
+diff -ruN a/piper-vamp-cpp/vamp-client/qt/test.pro b/piper-vamp-cpp/vamp-client/qt/test.pro
+--- a/piper-vamp-cpp/vamp-client/qt/test.pro 2019-12-10 10:29:29.000000000 +0100
++++ b/piper-vamp-cpp/vamp-client/qt/test.pro 2019-12-12 15:14:09.346349232 +0100
+@@ -4,10 +4,6 @@
+ CONFIG += qt stl c++11 c++14 exceptions console warn_on
+ QT -= xml network gui widgets
+
+-!win32 {
+- QMAKE_CXXFLAGS += -Werror
+-}
+-
+ OBJECTS_DIR = ../o
+ MOC_DIR = ../o
+
+diff -ruN a/svapp/configure.ac b/svapp/configure.ac
+--- a/svapp/configure.ac 2019-12-10 10:29:23.000000000 +0100
++++ b/svapp/configure.ac 2019-12-12 15:12:14.114022634 +0100
+@@ -54,7 +54,7 @@
+
+ if test "x$GCC" = "xyes"; then
+ CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+- CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
++ CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+ CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
+ CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
+ fi
+diff -ruN a/svcore/configure.ac b/svcore/configure.ac
+--- a/svcore/configure.ac 2019-12-10 10:29:18.000000000 +0100
++++ b/svcore/configure.ac 2019-12-12 15:12:00.407474914 +0100
+@@ -54,7 +54,7 @@
+
+ if test "x$GCC" = "xyes"; then
+ CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+- CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
++ CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+ CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
+ CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
+ fi
+diff -ruN a/svgui/configure.ac b/svgui/configure.ac
+--- a/svgui/configure.ac 2019-12-10 10:29:21.000000000 +0100
++++ b/svgui/configure.ac 2019-12-12 15:11:44.720944164 +0100
+@@ -54,7 +54,7 @@
+
+ if test "x$GCC" = "xyes"; then
+ CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+- CXXFLAGS_DEBUG="$CXXFLAGS_ANY -Werror -g"
++ CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+ CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
+ CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
+ fi
More information about the arch-commits
mailing list