Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Willam Christensen 2014-07-22 07:40:09 -06:00
commit e6304975a6
5 changed files with 125 additions and 55 deletions

View file

@ -8,7 +8,7 @@
# - remove wine makedepend, no vst # - remove wine makedepend, no vst
pkgname=lmms pkgname=lmms
pkgver=1.0.0 pkgver=1.0.2
pkgrel=1 pkgrel=1
pkgdesc='The Linux MultiMedia Studio.' pkgdesc='The Linux MultiMedia Studio.'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -24,18 +24,25 @@ provides=('lmms-extras')
conflicts=('lmms-extras') conflicts=('lmms-extras')
options=('!makeflags') options=('!makeflags')
install=lmms.install install=lmms.install
source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2/download" source=("${pkgname}-${pkgver}-src.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2/download"
lmms-1.0.2-build-fix.patch
zynaddsubfx_unlink.patch) zynaddsubfx_unlink.patch)
md5sums=('72260dd6e29bf018875fd751c1d43465' md5sums=('db1c3e432cad933c9fd124c4840c0bf1'
'2ff166311a02cf6220dda5cac660528a'
'd2ea78ac0cf2979505f140c6845617cf') 'd2ea78ac0cf2979505f140c6845617cf')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i ../lmms-1.0.2-build-fix.patch
patch -Np1 -i ../zynaddsubfx_unlink.patch
}
build() { build() {
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
patch -Np1 -i ../zynaddsubfx_unlink.patch
cmake . -DCMAKE_INSTALL_PREFIX=/usr cmake . -DCMAKE_INSTALL_PREFIX=/usr
make make
} }

View file

@ -0,0 +1,86 @@
From ab55b26e4b1521e5401f60a2f618f31579e9cc5c Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sat, 5 Jul 2014 17:46:10 +0200
Subject: [PATCH] SWH/BodeShifterCV: fix out-of-bounds array access
The xcoeffs array only has 100 elements and thus accessing xcoeffs[100]
leads to undefined behaviour.
---
plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
index 41fb4f0..967edf6 100644
--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
+++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
@@ -247,7 +247,7 @@ static void runBodeShifterCV(LADSPA_Handle instance, unsigned long sample_count)
/* Perform the Hilbert FIR convolution
* (probably FFT would be faster) */
hilb = 0.0f;
- for (i = 0; i <= NZEROS/2; i++) {
+ for (i = 0; i < NZEROS/2; i++) {
hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]);
}
--
1.9.3
From f91925f34aa1ee8ecacb12b8c4943c7e8aaabbfe Mon Sep 17 00:00:00 2001
From: Rafael Ruggiero <rafael46w@gmail.com>
Date: Tue, 15 Jul 2014 17:41:07 -0300
Subject: [PATCH] Update bode_shifter_cv_1432.c
---
plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
index 967edf6..a9c764e 100644
--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
+++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
@@ -350,7 +350,7 @@ static void runAddingBodeShifterCV(LADSPA_Handle instance, unsigned long sample_
/* Perform the Hilbert FIR convolution
* (probably FFT would be faster) */
hilb = 0.0f;
- for (i = 0; i <= NZEROS/2; i++) {
+ for (i = 0; i < NZEROS/2; i++) {
hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]);
}
--
1.9.3
From ad35c553b39fc70237605952bf2c6ff1fac5b7b7 Mon Sep 17 00:00:00 2001
From: Rafael Ruggiero <rafael46w@gmail.com>
Date: Tue, 15 Jul 2014 17:42:01 -0300
Subject: [PATCH] Update surround_encoder_1401.c
---
plugins/LadspaEffect/swh/surround_encoder_1401.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/LadspaEffect/swh/surround_encoder_1401.c b/plugins/LadspaEffect/swh/surround_encoder_1401.c
index d4b6ace..100a03e 100644
--- a/plugins/LadspaEffect/swh/surround_encoder_1401.c
+++ b/plugins/LadspaEffect/swh/surround_encoder_1401.c
@@ -228,7 +228,7 @@ static void runSurroundEncoder(LADSPA_Handle instance, unsigned long sample_coun
for (pos = 0; pos < sample_count; pos++) {
delay[dptr] = s[pos];
hilb = 0.0f;
- for (i = 0; i <= NZEROS/2; i++) {
+ for (i = 0; i < NZEROS/2; i++) {
hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]);
}
dptr = (dptr + 1) & (D_SIZE - 1);
@@ -296,7 +296,7 @@ static void runAddingSurroundEncoder(LADSPA_Handle instance, unsigned long sampl
for (pos = 0; pos < sample_count; pos++) {
delay[dptr] = s[pos];
hilb = 0.0f;
- for (i = 0; i <= NZEROS/2; i++) {
+ for (i = 0; i < NZEROS/2; i++) {
hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]);
}
dptr = (dptr + 1) & (D_SIZE - 1);
--
1.9.3

View file

@ -13,14 +13,14 @@
buildarch=20 buildarch=20
pkgname=thunderbird pkgname=thunderbird
pkgver=24.6.0 pkgver=31.0
pkgrel=1 pkgrel=1
pkgdesc="Standalone Mail/News reader" pkgdesc="Standalone Mail/News reader"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('MPL' 'GPL') license=('MPL' 'GPL')
url="http://www.mozilla.org/thunderbird/" url="http://www.mozilla.org/thunderbird/"
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse')
optdepends=('libcanberra: for sound support') optdepends=('libcanberra: for sound support')
install=thunderbird.install install=thunderbird.install
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2{,.asc} source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2{,.asc}
@ -30,16 +30,16 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sou
vendor.js vendor.js
no-neon.patch) no-neon.patch)
options=(!emptydirs) options=(!emptydirs)
sha256sums=('ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea' sha256sums=('571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4'
'SKIP' 'SKIP'
'84adca3cc1ed19cd4fce8c5cdb21923f8266246595b53e5a469d0c4cf57680f2' '8311aaf51f651670ba50d914167b8cb12046e5f429be7d11e4402e359427ee2a'
'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e' 'd506b771e765e09e2e039b975e25befade8eec97e8950813a32463604955ab4e'
'929a7ceca0e90d0635a2099b7df24033e865fb5b5b8c5824468c4561c21c377d' '9049ab3f9600a1592a54c41a166c76e046c393e1cfe7c4e769155b7317d197ee'
'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed' 'e4ea8e6788163d9f8db8f1f40023db3ea0a1358f9a4510169f2d4c4fe6a887ed'
'e9c75dbc86d96efec6f8bb4fea949fafe20d72bfefacc427decbd7fab801bd00') 'e9c75dbc86d96efec6f8bb4fea949fafe20d72bfefacc427decbd7fab801bd00')
prepare() { prepare() {
cd comm-esr24 cd comm-esr31
patch -Np1 -i "$srcdir/thunderbird-install-dir.patch" patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
patch -Np0 -i ../no-neon.patch patch -Np0 -i ../no-neon.patch
@ -52,7 +52,7 @@ prepare() {
} }
build() { build() {
cd comm-esr24 cd comm-esr31
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
export PYTHON="/usr/bin/python2" export PYTHON="/usr/bin/python2"
@ -61,7 +61,7 @@ build() {
} }
package() { package() {
cd comm-esr24 cd comm-esr31
make -j1 -f client.mk DESTDIR="$pkgdir" install make -j1 -f client.mk DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js" install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
@ -79,5 +79,5 @@ package() {
ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
# We don't want the development stuff # We don't want the development stuff
rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl} rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel-*,share/idl}
} }

View file

@ -41,6 +41,7 @@ ac_add_options --disable-updater
ac_add_options --disable-tests ac_add_options --disable-tests
ac_add_options --disable-mochitest ac_add_options --disable-mochitest
ac_add_options --disable-installer ac_add_options --disable-installer
ac_add_options --disable-debug-symbols
# Optimization # Optimization
ac_add_options --enable-optimize ac_add_options --enable-optimize

View file

@ -1,47 +1,23 @@
diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk diff -upr comm-esr31.orig/config/baseconfig.mk comm-esr31/config/baseconfig.mk
--- comm-release.orig/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200 --- comm-esr31.orig/config/baseconfig.mk 2014-07-22 09:44:23.000000000 +0300
+++ comm-release/config/baseconfig.mk 2012-11-21 03:20:35.000000000 +0200 +++ comm-esr31/config/baseconfig.mk 2014-07-22 09:46:30.000000000 +0300
@@ -1,9 +1,9 @@ @@ -1,6 +1,6 @@
INCLUDED_AUTOCONF_MK = 1 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+includedir := $(includedir)/$(MOZ_APP_NAME)
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZILLA_SRCDIR = $(topsrcdir)/mozilla MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZDEPTH = $(DEPTH)/mozilla MOZDEPTH = $(DEPTH)/mozilla
DIST = $(MOZDEPTH)/dist diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk --- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300
--- comm-release.orig/mozilla/config/baseconfig.mk 2012-11-21 03:19:16.000000000 +0200 +++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300
+++ comm-release/mozilla/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200 @@ -4,7 +4,7 @@
@@ -1,9 +1,9 @@ # whether a normal build is happening or whether the check is running.
INCLUDED_AUTOCONF_MK = 1 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+includedir := $(includedir)/$(MOZ_APP_NAME)
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
DIST = $(DEPTH)/dist ifndef TOP_DIST
TOP_DIST = dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk
--- comm-release.orig/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:15.000000000 +0200
+++ comm-release/mozilla/js/src/config/baseconfig.mk 2012-11-21 03:19:20.000000000 +0200
@@ -1,7 +1,7 @@
INCLUDED_AUTOCONF_MK = 1
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
ifneq (,$(filter /%,$(TOP_DIST)))
DIST = $(TOP_DIST)