[arch-commits] Commit in lsp-plugins/trunk (PKGBUILD relro_pie.patch)
Date: Sunday, December 30, 2018 @ 17:51:02
Author: dvzrv
Revision: 419402
upgpkg: lsp-plugins 1.1.5-1
Upgrading to 1.1.5. Removing unneeded RELRO/PIE patch.
Modified:
lsp-plugins/trunk/PKGBUILD
Deleted:
lsp-plugins/trunk/relro_pie.patch
-+
PKGBUILD| 23 -
relro_pie.patch | 826 --
2 files changed, 11 insertions(+), 838 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-30 17:47:14 UTC (rev 419401)
+++ PKGBUILD2018-12-30 17:51:02 UTC (rev 419402)
@@ -1,27 +1,23 @@
# Maintainer: David Runge
pkgname=lsp-plugins
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.5
+pkgrel=1
pkgdesc="Collection of free plugins compatible with LADSPA, LV2 and LinuxVST"
arch=('x86_64')
url="https://lsp-plug.in;
license=('LGPL3')
groups=('ladspa-plugins' 'lv2-plugins' 'pro-audio' 'vst-plugins')
-depends=('cairo' 'glu' 'jack' 'libglvnd' 'libsndfile')
+depends=('cairo' 'glu' 'jack' 'libglvnd')
makedepends=('ladspa' 'lv2' 'php')
-source=("https://github.com/sadko4u/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz;
-'relro_pie.patch')
-sha512sums=('214af5c9cb3adf5013359768356594ba9e8d2ee214e9b10e2f51d7b1b51e6c7a7aaebff826149dcd7a9fa945cbac623422c53e46165b2091f5c35ca0d0807617'
-
'fe1c477809426fc06e1c8b804fde2d88f49ae2b9adb4728c46fcdc3730f869f91dc87bece22d406283d64f76b3aae541c00e8122d0d21a14442baac4e2e855da')
+source=("https://github.com/sadko4u/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz;)
+sha512sums=('42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699')
prepare() {
-# local _relro="-Wl,-z,relro,-z,now"
mv -v "$pkgname-$pkgname-$pkgver" "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
- patch -Np1 -i ../relro_pie.patch
# removing /usr/local/lib from RPATH
- sed -e '/LD_PATH/ s|:/usr/local/lib||' \
- -i Makefile
+ sed -e '/LD_PATH/ s|:/usr/local/lib||g' \
+ -i scripts/make/configure.mk
}
build() {
@@ -35,7 +31,10 @@
check() {
local _test_path="$(pwd)/.build-test"
cd "$pkgname-$pkgver"
- ${_test_path}/lsp-plugins-test utest --nofork --debug --verbose
+ ${_test_path}/lsp-plugins-test utest \
+--nofork \
+--debug \
+--verbose || warning "Known flaky test:
https://github.com/sadko4u/lsp-plugins/issues/19;
}
package() {
Deleted: relro_pie.patch
===
--- relro_pie.patch 2018-12-30 17:47:14 UTC (rev 419401)
+++ relro_pie.patch 2018-12-30 17:51:02 UTC (rev 419402)
@@ -1,826 +0,0 @@
-diff -ruN lsp-plugins/Makefile lsp-plugins-fix/Makefile
lsp-plugins/Makefile 2018-10-02 19:34:33.893727476 +0200
-+++ lsp-plugins-fix/Makefile 2018-10-04 23:39:10.818524204 +0200
-@@ -88,14 +88,14 @@
- export BASEDIR = ${CURDIR}
- export INCLUDE = ${INC_FLAGS}
- export MAKE_OPTS= -s
--export CFLAGS = $(CC_ARCH) -std=c++98 -fPIC -fdata-sections
-ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall
-pthread -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\"
-+export CFLAGS = $(CC_ARCH) -std=c++98 -fdata-sections
-ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe
-fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\"
- export CC = g++
- export PHP = php
- export LD = ld
- export LDFLAGS = $(LD_ARCH) -L$(LD_PATH)
--export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,--gc-sections
-shared -Llibrary -lc -lm -fPIC -lpthread
-+export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH)
-Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC
- export MERGE_FLAGS = $(LD_ARCH) -r
--export EXE_FLAGS= $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,--gc-sections
-lm -fPIC -pthread
-+export EXE_FLAGS= $(CC_ARCH) -Wl,-rpath,$(LD_PATH)
-Wl,-z,relro,-z,now -Wl,--gc-sections -pie -fPIE
-
- # Objects
- export OBJ_CORE = $(OBJDIR)/core.o
-@@ -134,6 +134,9 @@
- export PHP_PLUGINS = $(OBJDIR)/plugins.php
-
- # Compile headers and linkage libraries
-+export PTHREAD_LIBS = -lpthread
-+export MATH_LIBS= -lm
-+export DL_LIBS = -ldl
- export CAIRO_HEADERS= $(shell pkg-config --cflags cairo)
- export CAIRO_LIBS = $(shell pkg-config --libs cairo)
- export XLIB_HEADERS = $(shell pkg-config --cflags x11)
-@@ -164,7 +167,7 @@
-
- default: all
-
--all: export CFLAGS += -O2
-+all: export CFLAGS += -O2 -DLSP_NO_EXPERIMENTAL
- all: compile
-
- trace: export CFLAGS+= -DLSP_TRACE
-diff -ruN lsp-plugins/TODO.txt lsp-plugins-fix/TODO.txt
lsp-plugins/TODO.txt 2018-10-02 19:34:33.897060773 +0200
-+++ lsp-plugins-fix/TODO.txt 2018-10-02 19:35:32.626431501 +0200
-@@ -11,6 +11,8 @@
-
- === 1.1.5 ===
-
-+* Fixed building issues under
[arch-commits] Commit in lsp-plugins/trunk (PKGBUILD relro_pie.patch)
Date: Thursday, October 4, 2018 @ 22:07:04
Author: dvzrv
Revision: 389682
upgpkg: lsp-plugins 1.1.4-2
Adding lsp-plugins 1.1.4 with patch for full RELRO and PIE for the jack clients.
Modified:
lsp-plugins/trunk/PKGBUILD
lsp-plugins/trunk/relro_pie.patch
-+
PKGBUILD|4
relro_pie.patch | 523 +++---
2 files changed, 502 insertions(+), 25 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-04 21:24:51 UTC (rev 389681)
+++ PKGBUILD2018-10-04 22:07:04 UTC (rev 389682)
@@ -1,7 +1,7 @@
# Maintainer: David Runge
pkgname=lsp-plugins
pkgver=1.1.4
-pkgrel=1
+pkgrel=2
pkgdesc="Collection of free plugins compatible with LADSPA, LV2 and LinuxVST"
arch=('x86_64')
url="https://lsp-plug.in;
@@ -12,7 +12,7 @@
source=("https://github.com/sadko4u/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz;
'relro_pie.patch')
sha512sums=('214af5c9cb3adf5013359768356594ba9e8d2ee214e9b10e2f51d7b1b51e6c7a7aaebff826149dcd7a9fa945cbac623422c53e46165b2091f5c35ca0d0807617'
-
'8801dc4f00ec5feb3766b532db413462e4d0c64329c8ce1941d875705c99d772d60796fa88aa92c94e59be8324b8a1ff88664d98d2e5541b26f56fa8b1654ae0')
+
'fe1c477809426fc06e1c8b804fde2d88f49ae2b9adb4728c46fcdc3730f869f91dc87bece22d406283d64f76b3aae541c00e8122d0d21a14442baac4e2e855da')
prepare() {
# local _relro="-Wl,-z,relro,-z,now"
Modified: relro_pie.patch
===
--- relro_pie.patch 2018-10-04 21:24:51 UTC (rev 389681)
+++ relro_pie.patch 2018-10-04 22:07:04 UTC (rev 389682)
@@ -1,20 +1,12 @@
diff -ruN lsp-plugins/Makefile lsp-plugins-fix/Makefile
--- lsp-plugins/Makefile 2018-10-02 19:34:33.893727476 +0200
-+++ lsp-plugins-fix/Makefile 2018-10-02 19:35:32.626431501 +0200
-@@ -30,6 +30,7 @@
- INC_FLAGS = -I"${CURDIR}/include"
- INSTALLATIONS = install_ladspa install_lv2 install_jack install_doc
install_vst
- RELEASES= release_ladspa release_lv2 release_jack release_src
release_doc release_vst
-+CC_FLAGS= -DLSP_NO_EXPERIMENTAL
-
- # Build profile
- ifndef BUILD_PROFILE
-@@ -88,14 +89,14 @@
lsp-plugins-fix/Makefile 2018-10-04 23:39:10.818524204 +0200
+@@ -88,14 +88,14 @@
export BASEDIR = ${CURDIR}
export INCLUDE = ${INC_FLAGS}
export MAKE_OPTS= -s
-export CFLAGS = $(CC_ARCH) -std=c++98 -fPIC -fdata-sections
-ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall
-pthread -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\"
-+export CFLAGS = $(CC_ARCH) -std=c++98 -fPIC -fdata-sections
-ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe
-fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\"
++export CFLAGS = $(CC_ARCH) -std=c++98 -fdata-sections
-ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe
-fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\"
export CC = g++
export PHP = php
export LD = ld
@@ -27,7 +19,7 @@
# Objects
export OBJ_CORE = $(OBJDIR)/core.o
-@@ -134,6 +135,9 @@
+@@ -134,6 +134,9 @@
export PHP_PLUGINS = $(OBJDIR)/plugins.php
# Compile headers and linkage libraries
@@ -37,6 +29,15 @@
export CAIRO_HEADERS= $(shell pkg-config --cflags cairo)
export CAIRO_LIBS = $(shell pkg-config --libs cairo)
export XLIB_HEADERS = $(shell pkg-config --cflags x11)
+@@ -164,7 +167,7 @@
+
+ default: all
+
+-all: export CFLAGS += -O2
++all: export CFLAGS += -O2 -DLSP_NO_EXPERIMENTAL
+ all: compile
+
+ trace: export CFLAGS+= -DLSP_TRACE
diff -ruN lsp-plugins/TODO.txt lsp-plugins-fix/TODO.txt
--- lsp-plugins/TODO.txt 2018-10-02 19:34:33.897060773 +0200
+++ lsp-plugins-fix/TODO.txt 2018-10-02 19:35:32.626431501 +0200
@@ -110,9 +111,21 @@
// Transfer MIDI events
size_t events = pMidi->nEvents;
+diff -ruN lsp-plugins/src/Makefile lsp-plugins-fix/src/Makefile
+--- lsp-plugins/src/Makefile 2018-10-02 19:34:34.253723619 +0200
lsp-plugins-fix/src/Makefile 2018-10-04 23:39:10.818524204 +0200
+@@ -46,7 +46,7 @@
+ @mkdir -p $(OBJDIR)/res
+ @$(UTL_RESGEN) $(BASEDIR)/res/ui $(OBJDIR)/res/xml_resource.cpp
+ @-rm gmon.out >/dev/null 2>&1
+- @$(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDE)
$(OBJDIR)/res/xml_resource.cpp -o $(OBJ_RES_CORE)
++ @$(CC) -o $(OBJ_RES_CORE) -c $(OBJDIR)/res/xml_resource.cpp -fPIC
$(CPPFLAGS) $(CFLAGS) $(INCLUDE)
+
+ # Target dependencies
+ container: $(CONTAINER_DEPS)
diff -ruN lsp-plugins/src/container/Makefile
lsp-plugins-fix/src/container/Makefile
--- lsp-plugins/src/container/Makefile 2018-10-02 19:34:34.253723619 +0200
-+++
