From fcb9757f17ad65c0e3d25b4a446d844ed82acb73 Mon Sep 17 00:00:00 2001 From: David Woodfall Date: Mon, 14 Jun 2010 00:34:14 -0500 Subject: audio/portmidi: Build fixes for x86_64 Signed-off-by: Robby Workman --- audio/portmidi/doinst.sh | 10 ++++++++++ audio/portmidi/portmidi.SlackBuild | 27 ++++++++++++++------------- audio/portmidi/portmidi.info | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 audio/portmidi/doinst.sh diff --git a/audio/portmidi/doinst.sh b/audio/portmidi/doinst.sh new file mode 100644 index 0000000000..1f8ff67ded --- /dev/null +++ b/audio/portmidi/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/audio/portmidi/portmidi.SlackBuild b/audio/portmidi/portmidi.SlackBuild index 4398745a2d..e83e8efce6 100644 --- a/audio/portmidi/portmidi.SlackBuild +++ b/audio/portmidi/portmidi.SlackBuild @@ -2,8 +2,7 @@ # Slackware build script for portmidi -# Copyright 2009 David Woodfall -# aka dive in #slackware on freenode.net +# Copyright 2009 David Woodfall # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +22,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Thanks to Camarade_Tux, Fire|Bird, and Metrofox for their assistance in -# getting the 64 bit build to work, and for putting up with constant cries -# for help ;-) - PRGNAM=portmidi VERSION=${VERSION:-200} BUILD=${BUILD:-1} @@ -79,7 +74,7 @@ find . \ # Fix the libjvm.so path. This is *really* only needed on x86_64, but fixing # it on both arches looks prettier :-) --rworkman -sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%" $CWD/fixup_java_path.diff | patch -p1 +sed "s%@LIBDIR@%/usr/lib${LIBDIRSUFFIX}%" $CWD/fixup_java_path.diff | patch --verbose -p1 cmake . \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ @@ -88,15 +83,19 @@ cmake . \ -DCMAKE_CACHEFILE_DIR=$PKG \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$PKG/usr/lib$LIBDIRSUFFIX" \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$PKG/usr/lib$LIBDIRSUFFIX" \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$PKG/usr/bin + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$PKG/usr/bin \ + -DJAVA_AWT_INCLUDE_PATH="/usr/lib$LIBDIRSUFFIX/java/include" \ + -DJAVA_INCLUDE_PATH="/usr/lib$LIBDIRSUFFIX/java/include" \ + -DJAVA_INCLUDE_PATH2="/usr/lib$LIBDIRSUFFIX/java/include/linux" \ + -DJAVA_JVM_LIBRARY="/usr/lib$LIBDIRSUFFIX/libjvm.so" -patch -p1 < $CWD/portmidi-shared.diff +patch --verbose -p1 < $CWD/portmidi-shared.diff # Fixup for hardcoded usr/local find . \( -name cmake_install.cmake -o -name CMakeLists.txt -o -name Makefile \) \ -exec sed -i 's%/local%%g' '{}' \; -make -j1 all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER" +make all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER" make install DESTDIR=$PKG rm -f $PKG/usr/lib/libportmidi_s.a @@ -104,12 +103,13 @@ rm -f $PKG/usr/lib/libportmidi_s.a mv $PKG/usr/bin/test $PKG/usr/bin/portmiditest # Pinched from fc spec -install -m 644 pm_common/pmutil.h $PKG/usr/include +install -m 0644 -D pm_common/pmutil.h $PKG/usr/include mkdir -p $PKG/usr/share/applications -install -m 644 $CWD/pmdefaults.desktop $PKG/usr/share/applications +install -m 0644 -D $CWD/pmdefaults.desktop $PKG/usr/share/applications/pmdefaults.desktop mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps -install -m 644 pm_java/pmdefaults/pmdefaults-icon.png $PKG/usr/share/icons/hicolor/128x128/apps +install -m 0644 -D pm_java/pmdefaults/pmdefaults-icon.png \ + $PKG/usr/share/icons/hicolor/128x128/apps/pmdefaults-icon.png find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -120,6 +120,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/portmidi/portmidi.info b/audio/portmidi/portmidi.info index 082988d8eb..1e6752845a 100644 --- a/audio/portmidi/portmidi.info +++ b/audio/portmidi/portmidi.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Woodfall" EMAIL="info@davidwoodfall.co.uk" -APPROVED="Erik Hanson" +APPROVED="rworkman" -- cgit v1.2.3