From 71a63b3ef685c4f3166986467bdac53b48f431eb Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:34:17 -0400 Subject: [PATCH 1/8] soundtouch: update to 1.9.2 (soname bump). --- common/shlibs | 2 +- srcpkgs/soundtouch/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index e70fd40675..481969464a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1124,7 +1124,7 @@ libgdmsimplegreeter.so.1 gdm-3.6.0_1 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1 libcheese.so.8 libcheese-3.17.90_1 libcheese-gtk.so.25 libcheese-3.17.90_1 -libSoundTouch.so.0 soundtouch-1.7.0_1 +libSoundTouch.so.1 soundtouch-1.9.2_1 libzapojit-0.0.so.0 libzapojit-0.0.2_1 libmusicbrainz5.so.1 libmusicbrainz5-5.1.0_1 librygel-core-2.6.so.2 librygel-0.26.0_1 diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template index 214ea8f18b..c569352286 100644 --- a/srcpkgs/soundtouch/template +++ b/srcpkgs/soundtouch/template @@ -1,6 +1,6 @@ # Template file for 'soundtouch' pkgname=soundtouch -version=1.9.1 +version=1.9.2 revision=1 wrksrc=${pkgname} build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.surina.net/soundtouch" license="LGPL-2.1" distfiles="http://www.surina.net/soundtouch/soundtouch-${version}.tar.gz" -checksum=7d22e09e5e0a5bb8669da4f97ec1d6ee324aa3e7515db7fa2554d08f5259aecd +checksum=caeb86511e81420eeb454cb5db53f56d96b8451d37d89af6e55b12eb4da1c513 pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac From 9a919c91258a3f60b5ac9b4c6ec2092baba51bc2 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:40:32 -0400 Subject: [PATCH 2/8] audacity: rebuild against soundtouch-1.9.2 --- srcpkgs/audacity/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index 14457fefbc..5f0d9eb9c7 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -1,7 +1,7 @@ # Template file for 'audacity' pkgname=audacity version=2.1.1 -revision=2 +revision=3 wrksrc="${pkgname}-Audacity-${version}" build_style=gnu-configure configure_args="--with-libsamplerate" From 2f09f9d4cb2c0511524163366d665bcb5330fc4e Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:41:08 -0400 Subject: [PATCH 3/8] desmume: rebuild against soundtouch-1.9.2 --- srcpkgs/desmume/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template index e40f4c7187..0740d287d3 100644 --- a/srcpkgs/desmume/template +++ b/srcpkgs/desmume/template @@ -1,7 +1,7 @@ # Template file for 'desmume' pkgname=desmume version=0.9.11 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx" hostmakedepends="pkg-config intltool" From 2ffc2b4424691ce4622a52397667be1a835691eb Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:41:29 -0400 Subject: [PATCH 4/8] dolphin-emu: rebuild against soundtouch-1.9.2 --- srcpkgs/dolphin-emu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 106e8920e3..0a86e2d488 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -8,7 +8,7 @@ CXXFLAGS="-mssse3" pkgname=dolphin-emu version=4.0.2 -revision=6 +revision=7 wrksrc="dolphin-${version}" build_style=cmake configure_args="-DUSE_X11=ON -DUSE_WAYLAND=OFF -DUSE_EGL=OFF -DUSE_GLES=OFF -DUSE_GLES3=OFF" From a39428c0cb207c5b441e6687acc18d43a1028679 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:42:16 -0400 Subject: [PATCH 5/8] gst-plugins-bad1: rebuild against soundtouch-1.9.2 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index fdd72b1e47..c558390efa 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1'. pkgname=gst-plugins-bad1 version=1:1.4.5 -revision=5 +revision=6 wrksrc="${pkgname/1/}-${version#*:}" lib32disabled=yes build_style=gnu-configure From 61cc3eabc62e7e9ca995735cee06262f8c644c3f Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 10:53:13 -0400 Subject: [PATCH 6/8] pcsx2: rebuild against soundtouch-1.9.2 --- srcpkgs/pcsx2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index 6df7a31f98..ba40053b57 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -4,7 +4,7 @@ lib32mode="full" pkgname=pcsx2 version=1.3.1 -revision=4 +revision=5 build_style=cmake configure_args="-DGLSL_API=1 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1 -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1" From 50e90b3557ba0ed1667b0d962cc200fa65416ae2 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 12:32:12 -0400 Subject: [PATCH 7/8] dolphin-emu: fix musl; build against our wxWidgets package. --- srcpkgs/dolphin-emu/patches/fix-musl.patch | 23 ++++++++++++++++++++++ srcpkgs/dolphin-emu/template | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dolphin-emu/patches/fix-musl.patch diff --git a/srcpkgs/dolphin-emu/patches/fix-musl.patch b/srcpkgs/dolphin-emu/patches/fix-musl.patch new file mode 100644 index 0000000000..98b86c80a6 --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/fix-musl.patch @@ -0,0 +1,23 @@ +--- ./Source/Core/Common/Src/Thread.cpp.orig 2015-10-21 12:01:13.444981266 -0400 ++++ ./Source/Core/Common/Src/Thread.cpp 2015-10-21 12:01:57.739979915 -0400 +@@ -123,7 +123,7 @@ + { + #ifdef __APPLE__ + pthread_setname_np(szThreadName); +-#else ++#elif defined __GLIBC__ + pthread_setname_np(pthread_self(), szThreadName); + #endif + } + +--- ./Source/Core/Core/Src/x64MemTools.cpp.orig 2015-10-21 12:16:39.401953012 -0400 ++++ ./Source/Core/Core/Src/x64MemTools.cpp 2015-10-21 12:16:55.380952525 -0400 +@@ -55,7 +55,7 @@ + namespace EMM + { + +-#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ ++#if defined __APPLE__ || defined __GLIBC__ || defined __FreeBSD__ + #include + void print_trace(const char * msg) + { diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 0a86e2d488..6d137031ea 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -11,12 +11,13 @@ version=4.0.2 revision=7 wrksrc="dolphin-${version}" build_style=cmake -configure_args="-DUSE_X11=ON -DUSE_WAYLAND=OFF -DUSE_EGL=OFF -DUSE_GLES=OFF -DUSE_GLES3=OFF" +configure_args="-DUSE_X11=ON -DUSE_WAYLAND=OFF -DUSE_EGL=OFF -DUSE_GLES=OFF -DUSE_GLES3=OFF + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" hostmakedepends="cmake pkg-config" makedepends=" zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel - portaudio-devel libopenal-devel soundtouch-devel lzo-devel" + portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel" depends="desktop-file-utils" short_desc="A Gamecube / Wii / Triforce emulator" maintainer="Juan RP " From f228b7b7530213480ed44ee56aa33b13fcccfc12 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 19:08:15 -0400 Subject: [PATCH 8/8] audacity: fix musl. The use of RTLD_DEEPBIND is just a workaround, not a real fix. When Audacity defines a proper external API, this patch can be removed. --- srcpkgs/audacity/patches/fix-musl.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/audacity/patches/fix-musl.patch diff --git a/srcpkgs/audacity/patches/fix-musl.patch b/srcpkgs/audacity/patches/fix-musl.patch new file mode 100644 index 0000000000..b078de3d34 --- /dev/null +++ b/srcpkgs/audacity/patches/fix-musl.patch @@ -0,0 +1,14 @@ +--- ./src/effects/VST/VSTEffect.cpp.orig 2015-10-21 14:25:52.942716426 -0400 ++++ ./src/effects/VST/VSTEffect.cpp 2015-10-21 14:28:45.521711160 -0400 +@@ -2576,6 +2576,11 @@ + // symbols. + // + // Once we define a proper external API, the flags can be removed. ++ ++#ifndef RTLD_DEEPBIND ++#define RTLD_DEEPBIND 0 ++#endif ++ + void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND); + if (!lib) + {