[arch-commits] Commit in pd/trunk (PKGBUILD pd-0.51.4-system_portmidi.patch)

[David Runge]

    Date: Wednesday, September 29, 2021 @ 19:43:16
  Author: dvzrv
Revision: 1026000

upgpkg: pd 0.51.4-2: Rebuild against portmidi 236.

Add patch for the autotools setup to rely on pkg-config for portmidi.
Apply fix for libtool to prevent excessive overlinking.

Added:
  pd/trunk/pd-0.51.4-system_portmidi.patch
Modified:
  pd/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   12 +++++++++++-
 pd-0.51.4-system_portmidi.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-29 19:33:26 UTC (rev 1025999)
+++ PKGBUILD	2021-09-29 19:43:16 UTC (rev 1026000)
@@ -8,7 +8,7 @@
 pkgname=pd
 pkgver=0.51.4
 _ver=${pkgver%.*}-${pkgver##*.}
-pkgrel=1
+pkgrel=2
 pkgdesc="The Pure Data real-time music and multimedia environment"
 arch=('x86_64')
 url="http://msp.ucsd.edu/software.html"
@@ -19,12 +19,15 @@
 'portmidi')
 provides=('puredata')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pure-data/pure-data/archive/${_ver}.tar.gz"
+        "${pkgname}-0.51.4-system_portmidi.patch"
         "${pkgname}-${pkgver}.svg::https://raw.githubusercontent.com/pure-data/pd-icon/9e4f117ade0bc1da951981128998ad82fff83b0c/masters/icon.svg"
         "${pkgname}-${pkgver}-icon-LICENSE.txt::https://raw.githubusercontent.com/pure-data/pd-icon/9e4f117ade0bc1da951981128998ad82fff83b0c/LICENSE.txt")
 sha512sums=('87c5b81730b13d4770b5a158362c7d7143e5218a23be689a78532adaf472554c242dcc1ab989e04924c3e4617a363435a616b5e8d8a29045196ac6fe527722a8'
+            '67f14a39ae9a7da3776d3d92b8bf2b695b6a4e465e76bb821b0d97440dabb550dfdc9e5e1426cb3a7eeb898b57a278ec59d4988b6560e305cc6acce98ac6eed9'
             '8d8b274e159bd4cc6a83d5d9d5019b106a74fa61943b36e2a56336b9c3c2c1b1092ce7f79f5264eb69ca43a9360404b800df338b2ad738ca3c237a8ae3c9c41d'
             'dfc919b56ffc8020ffa4e9b16677a6a710f78a73b22d5bb418414f3196a5cbbe5d6cc9cfbf1389811129f219cb21c0eafdfa6dd90e172d73db2452e5c3fd4f5c')
 b2sums=('22aabe30f9001b92e3dec83689f42678cb15653a6200380df1adc448d60b1deb2293b0de8ec78b5c87dc5f32b485a890562703fd4723e1094d45e137e10c9fd5'
+        'af41732beacc45be8ff561a9cb47f1dd369e913f434cf98f714241e986b69f19f784d3397730c5506738fb11fc985498013f843656b72835ca5973f65f8ae2a8'
         '04f131540fd7ae9b4547a081df61a5a98265c6c9b283587aeda976834d9bbb4486cd30470d5bfb37b6f760d13705074c71cfeb1a9843613e93f3d1e0ca198af9'
         'c3fabeeb8e5c45716fbf5d3e6338b41d5adc0fbefb385e3b42d94c732522e99a4045c88e8b8e2e16a72fc5795dbc0933f07078d0eba80b76fb274450c7518dc7')
 
@@ -31,6 +34,10 @@
 prepare() {
   mv -v "${_name}-${_ver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
+
+  # ensure the system portmidi libraries are properly linked against
+  patch -Np1 -i ../"${pkgname}-0.51.4-system_portmidi.patch"
+
   autoreconf -vfi
   # XDG desktop files
   gendesk -n \
@@ -49,6 +56,7 @@
 
 build() {
   cd "${pkgname}-${pkgver}"
+  export EXTERNAL_LDFLAGS="$LDFLAGS"
   ./configure --prefix=/usr \
               --enable-alsa \
               --enable-fftw \
@@ -58,6 +66,8 @@
               --disable-oss \
               --without-local-portaudio \
               --without-local-portmidi
+  # prevent excessive overlinking due to libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Added: pd-0.51.4-system_portmidi.patch
===================================================================
--- pd-0.51.4-system_portmidi.patch	                        (rev 0)
+++ pd-0.51.4-system_portmidi.patch	2021-09-29 19:43:16 UTC (rev 1026000)
@@ -0,0 +1,26 @@
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2020-12-28 01:32:57.000000000 +0100
++++ b/configure.ac	2021-09-29 21:12:24.897000721 +0200
+@@ -394,9 +394,7 @@
+   portmidi=no])
+ AS_IF([test x$portmidi = xyes],[
+     AS_IF([test x$local_portmidi = xno],[
+-        # fall back to local portmidi if not foud
+-        AC_CHECK_LIB([portmidi], [Pm_Initialize],
+-            [AC_MSG_NOTICE([Using system PortMidi])], [local_portmidi=yes])
++        PKG_CHECK_MODULES([LIBPORTMIDI], [portmidi])
+     ])
+     AS_IF([test x$local_portmidi = xyes],[
+         AS_IF([test -d "$srcdir/portmidi"],[
+diff -ruN a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2020-12-28 01:32:57.000000000 +0100
++++ b/src/Makefile.am	2021-09-29 21:12:53.977088547 +0200
+@@ -221,7 +221,7 @@
+ pd_LDADD_core += $(top_builddir)/portmidi/libportmidi.a
+ else
+ # link the system's portmidi
+-pd_LDADD_core += -lportmidi
++pd_LDADD_core += @LIBPORTMIDI_LIBS@
+ endif
+ 
+ # need Carbon framework for PM on Mac