[arch-commits] Commit in pd/trunk (3 files)

David Runge dvzrv at gemini.archlinux.org
Mon Dec 20 17:42:44 UTC 2021


    Date: Monday, December 20, 2021 @ 17:42:44
  Author: dvzrv
Revision: 1080497

upgpkg: pd 0.52.1-1: Upgrade to 0.52.1.

Update patch to link against system portmidi.
Simplify quoting in file.

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

---------------------------------+
 PKGBUILD                        |   55 +++++++++++++++++---------------------
 pd-0.51.4-system_portmidi.patch |   26 -----------------
 pd-0.52.1-system_portmidi.patch |   26 +++++++++++++++++
 3 files changed, 51 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-20 17:42:39 UTC (rev 1080496)
+++ PKGBUILD	2021-12-20 17:42:44 UTC (rev 1080497)
@@ -6,28 +6,28 @@
 _resolutions=( 16 32 48 64 96 128 256 512 1024 )
 _name=pure-data
 pkgname=pd
-pkgver=0.51.4
+pkgver=0.52.1
 _ver=${pkgver%.*}-${pkgver##*.}
-pkgrel=2
+pkgrel=1
 pkgdesc="The Pure Data real-time music and multimedia environment"
-arch=('x86_64')
+arch=(x86_64)
 url="http://msp.ucsd.edu/software.html"
-license=('BSD')
-groups=('pro-audio')
-depends=('glibc' 'hicolor-icon-theme' 'tk')
-makedepends=('alsa-lib' 'fftw' 'gendesk' 'inkscape' 'jack' 'portaudio'
-'portmidi')
-provides=('puredata')
+license=(BSD)
+groups=(pro-audio)
+depends=(glibc hicolor-icon-theme tk)
+makedepends=(alsa-lib fftw gendesk inkscape jack portaudio
+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}-0.52.1-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'
+sha512sums=('10841b6939b65c70e921fd69faea3e2253d70f45d015fe6ee1cd2010cce6b65f69ec0caf6541d8dc9f1d4f31efb1c0cc445898b86ae426a3fabb32b525c80847'
+            'afe4716dc722f6dc1ddd2c1f6262fa488dd9c5237066450be41aa3bae4dabd9d53c66278ad5a07b8c0aba7f0630f788593922a112a67ffe2cdb87d4488ccae2c'
             '8d8b274e159bd4cc6a83d5d9d5019b106a74fa61943b36e2a56336b9c3c2c1b1092ce7f79f5264eb69ca43a9360404b800df338b2ad738ca3c237a8ae3c9c41d'
             'dfc919b56ffc8020ffa4e9b16677a6a710f78a73b22d5bb418414f3196a5cbbe5d6cc9cfbf1389811129f219cb21c0eafdfa6dd90e172d73db2452e5c3fd4f5c')
-b2sums=('22aabe30f9001b92e3dec83689f42678cb15653a6200380df1adc448d60b1deb2293b0de8ec78b5c87dc5f32b485a890562703fd4723e1094d45e137e10c9fd5'
-        'af41732beacc45be8ff561a9cb47f1dd369e913f434cf98f714241e986b69f19f784d3397730c5506738fb11fc985498013f843656b72835ca5973f65f8ae2a8'
+b2sums=('b8b426415d1d65376ada740c52efe50d747506bf80bc1129f972ccc3b35aaf4611c520e950a097f51c6836cc2f5ff51dbc8dda4a7d3657407e6859b6aa07238d'
+        '5490b59ddd9ce4dc8af731b95fe09ee5b6be081c82cc6628b28b0b17983e2d6c274bbfe6f7bdbe34b9691fe6a11d6830a5597b06075457e64de6010d3f132a26'
         '04f131540fd7ae9b4547a081df61a5a98265c6c9b283587aeda976834d9bbb4486cd30470d5bfb37b6f760d13705074c71cfeb1a9843613e93f3d1e0ca198af9'
         'c3fabeeb8e5c45716fbf5d3e6338b41d5adc0fbefb385e3b42d94c732522e99a4045c88e8b8e2e16a72fc5795dbc0933f07078d0eba80b76fb274450c7518dc7')
 
@@ -36,9 +36,9 @@
   cd "${pkgname}-${pkgver}"
 
   # ensure the system portmidi libraries are properly linked against
-  patch -Np1 -i ../"${pkgname}-0.51.4-system_portmidi.patch"
+  patch -Np1 -i ../"${pkgname}-0.52.1-system_portmidi.patch"
 
-  autoreconf -vfi
+  autoreconf -fiv
   # XDG desktop files
   gendesk -n \
           --pkgname ${pkgname} \
@@ -72,28 +72,23 @@
 }
 
 package() {
-  depends+=('libasound.so' 'libfftw3f.so' 'libjack.so' 'libportaudio.so'
-  'libportmidi.so')
+  depends+=(libasound.so libfftw3f.so libjack.so libportaudio.so
+  libportmidi.so)
+
   cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   # licenses
-  install -vDm 644 LICENSE.txt \
-    -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -vDm 644 ../${pkgname}-${pkgver}-icon-LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/icon-LICENSE.txt"
+  install -vDm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 ../${pkgname}-${pkgver}-icon-LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/icon-LICENSE.txt"
 
   # desktop file
-  install -vDm 644 "${pkgname}.desktop" \
-    -t "${pkgdir}/usr/share/applications/"
+  install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
   # icons
-  install -vDm 644 "${pkgname}-32.png" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -vDm 644 "${srcdir}/${pkgname}-${pkgver}.svg" \
-    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+  install -vDm 644 "${pkgname}-32.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -vDm 644 "${srcdir}/${pkgname}-${pkgver}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
   for _res in ${_resolutions[@]}; do
-    install -vDm 644 "${pkgname}-${_res}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/${pkgname}.png"
+    install -vDm 644 "${pkgname}-${_res}.png" "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/${pkgname}.png"
   done
   # readme
   install -vDm 644 README.txt -t "${pkgdir}/usr/share/doc/${pkgname}/"

Deleted: pd-0.51.4-system_portmidi.patch
===================================================================
--- pd-0.51.4-system_portmidi.patch	2021-12-20 17:42:39 UTC (rev 1080496)
+++ pd-0.51.4-system_portmidi.patch	2021-12-20 17:42:44 UTC (rev 1080497)
@@ -1,26 +0,0 @@
-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

Added: pd-0.52.1-system_portmidi.patch
===================================================================
--- pd-0.52.1-system_portmidi.patch	                        (rev 0)
+++ pd-0.52.1-system_portmidi.patch	2021-12-20 17:42:44 UTC (rev 1080497)
@@ -0,0 +1,26 @@
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2021-12-20 00:21:34.000000000 +0100
++++ b/configure.ac	2021-12-20 18:37:26.445665793 +0100
+@@ -422,9 +422,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	2021-12-20 00:21:34.000000000 +0100
++++ b/src/Makefile.am	2021-12-20 18:37:51.975761871 +0100
+@@ -292,7 +292,7 @@
+ pd_LDADD_standalone += $(top_builddir)/portmidi/libportmidi.a
+ else
+ # link the system's portmidi
+-pd_LDADD_standalone += -lportmidi
++pd_LDADD_standalone += @LIBPORTMIDI_LIBS@
+ endif
+ 
+ # need Carbon framework for PM on Mac



More information about the arch-commits mailing list