commit 3d5f218de6c5776fcb4e96ea5f78250c3cae1bed Author: Danny Rawlins <contact@romster.me> Date: Sat Mar 13 16:28:44 2021 +1100 [notify] rubberband: 1.9 -> 1.9.1 made openjdk* optional and ladspa diff --git a/rubberband/.footprint b/rubberband/.footprint index 66c6c2404..7713ee09b 100644 --- a/rubberband/.footprint +++ b/rubberband/.footprint @@ -6,20 +6,12 @@ drwxr-xr-x root/root usr/include/rubberband/ -rw-r--r-- root/root usr/include/rubberband/RubberBandStretcher.h -rw-r--r-- root/root usr/include/rubberband/rubberband-c.h drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/ladspa/ --rw-r--r-- root/root usr/lib/ladspa/ladspa-rubberband.cat --rwxr-xr-x root/root usr/lib/ladspa/ladspa-rubberband.so --rwxr-xr-x root/root usr/lib/librubberband-jni.so -rw-r--r-- root/root usr/lib/librubberband.a -lrwxrwxrwx root/root usr/lib/librubberband.so -> librubberband.so.2.1.2 -lrwxrwxrwx root/root usr/lib/librubberband.so.2 -> librubberband.so.2.1.2 --rwxr-xr-x root/root usr/lib/librubberband.so.2.1.2 +lrwxrwxrwx root/root usr/lib/librubberband.so -> librubberband.so.2 +lrwxrwxrwx root/root usr/lib/librubberband.so.2 -> librubberband.so.2.1.3 +-rwxr-xr-x root/root usr/lib/librubberband.so.2.1.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/rubberband.pc drwxr-xr-x root/root usr/lib/vamp/ -rw-r--r-- root/root usr/lib/vamp/vamp-rubberband.cat -rwxr-xr-x root/root usr/lib/vamp/vamp-rubberband.so -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/ladspa/ -drwxr-xr-x root/root usr/share/ladspa/rdf/ --rw-r--r-- root/root usr/share/ladspa/rdf/ladspa-rubberband.rdf diff --git a/rubberband/.signature b/rubberband/.signature index a8fb053f0..e2fc64a50 100644 --- a/rubberband/.signature +++ b/rubberband/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/1Ya2Hx5dN1003W8u+IN4DW3utpWPu1ZTWufo++5qL0kpL6I1nsbPzivBWreWc2tJodPJYFLkZIjnQdSrP9YQA= -SHA256 (Pkgfile) = 9071e986ddba462ef389b77462bf57fc3c5b8cbd5b6bbd75c7446c1442181b3b -SHA256 (.footprint) = 8c1a70b67a34425a2efd0175bd95a7754182d662f1dee8d492aa58c7206a944e -SHA256 (rubberband-v1.9.tar.gz) = 779e9a5e45f869618261b98b8d0c262fcbe066418a1c836fb85de47fbc1b29aa +RWSagIOpLGJF3xMjl8DONNJEPx20IcGc6HaCTsSTluBVU174f2HLukp6fRxn4ZQoKoO328cMYOYwK6qm+Q0v27K3IfoehdD7AQc= +SHA256 (Pkgfile) = 1ce48590ba5ffa1bf7717661d93d7c54319f5582108c2abe6c971da2bb3259b7 +SHA256 (.footprint) = ce0389eca7d0340dc754e2ac1fe10a5858b1a0d89339c9f27e97f4037f60a400 +SHA256 (rubberband-v1.9.1.tar.gz) = 11a7da4f07cd7da17ae30f432742be6d51d05adb250c89f3867b10b12f54a3b9 diff --git a/rubberband/Pkgfile b/rubberband/Pkgfile index 8f7f14621..095d0fabc 100644 --- a/rubberband/Pkgfile +++ b/rubberband/Pkgfile @@ -1,23 +1,36 @@ # Description: Time-stretching and pitch-shifting audio library and utility. # URL: https://www.breakfastquay.com/rubberband/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: fftw libsamplerate openjdk8 ladspa vamp-plugin-sdk +# Depends on: fftw libsamplerate meson ninja vamp-plugin-sdk +# Optional: openjdk8 openjdk11 openjdk15 ladspa libogg libvorbis opus name=rubberband -version=1.9 +version=1.9.1 release=1 source=(https://github.com/breakfastquay/$name/archive/v$version/$name-v$version.tar...) build() { - cd $name-$version + if [ -e '/usr/lib/java' ]; then + [ -n "${JAVA_HOME}" ] || export JAVA_HOME="/usr/lib/java/openjdk8" - autoreconf -vfi + if prt-get isinst openjdk8; then +local java_major="$($JAVA_HOME/bin/java -version 2>&1 | awk '/openjdk/ {split($3,java,"."); print java[2]}')" +PKGMK_RUBBERBAND+=" -D extra_include_dirs=/usr/lib/java/openjdk${java_major}/include,/usr/lib/java/openjdk${java_major}/include/linux" +export PATH="/usr/lib/java/openjdk${java_major}/bin:$PATH" + else +#local java_major=$($JAVA_HOME/bin/java -version 2>&1 | awk '/openjdk/ {split($3,java,"."); print java[1]}' | awk -F'"' '{print $1}') +local java_major="$($JAVA_HOME/bin/java -version 2>&1 | awk '/OpenJDK 64-Bit/ {split($6,java,"."); print java[1]}')" +PKGMK_RUBBERBAND+=" -D extra_include_dirs=/usr/lib/java/openjdk${java_major}-jdk/include,/usr/lib/java/openjdk${java_major}-jdk/include/linux" +export PATH="/usr/lib/java/openjdk${java_major}-jdk/bin:$PATH" + fi + fi - ./configure --prefix=/usr - make + meson setup build $name-$version ${PKGMK_RUBBERBAND} \ + --prefix=/usr \ + --buildtype=plain \ + -D fft=fftw \ + -D resampler=libsamplerate - export JAVA_HOME=/usr/lib/java/openjdk8 - make jni - - make DESTDIR=$PKG install + meson compile -C build -j ${JOBS:-1} + DESTDIR=$PKG meson install -C build }