diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
commit | 6cc3a23ea1231ea627394677df2bebdc403acb38 (patch) | |
tree | 14c20984a10df92c0b5cbb3b4477f0358cf8b01f /community/portmidi | |
parent | 8e40bdbb2496be15fdba2e683af427bc2333be42 (diff) | |
parent | 3741146d50cb93e8985f8aac937e36d35ee76446 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/torcs/PKGBUILD
community/fceux/PKGBUILD
core/gcc/PKGBUILD
core/wireless_tools/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/gtk2/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdelibs/PKGBUILD
testing/libarchive/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/udev/PKGBUILD
Diffstat (limited to 'community/portmidi')
-rw-r--r-- | community/portmidi/PKGBUILD | 13 | ||||
-rw-r--r-- | community/portmidi/portmidi-217-build-fix.patch | 29 |
2 files changed, 38 insertions, 4 deletions
diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD index 1ddd9bd97..033f881a6 100644 --- a/community/portmidi/PKGBUILD +++ b/community/portmidi/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 31348 2010-10-30 15:46:33Z lfleischer $ +# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Denis Martinez <deuns.martinez AT gmail DOT com> pkgname=portmidi pkgver=217 -pkgrel=2 +pkgrel=3 pkgdesc="Platform independent library for real-time MIDI input/output." arch=('i686' 'x86_64' 'mips64el') url='http://portmedia.sourceforge.net/' license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip") -md5sums=('03f46fd3947e2ef4c8c465baaf832241') +source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" + 'portmidi-217-build-fix.patch') +md5sums=('03f46fd3947e2ef4c8c465baaf832241' + '59cb428b29a33bab3bb5811cda479a9b') build() { cd "${srcdir}/${pkgname}" @@ -21,6 +23,9 @@ build() { sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py mkdir -p pm_java/Release + # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) + patch -p1 -i ../portmidi-217-build-fix.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch new file mode 100644 index 000000000..3e2dfef29 --- /dev/null +++ b/community/portmidi/portmidi-217-build-fix.patch @@ -0,0 +1,29 @@ +diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt +--- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 ++++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 +@@ -15,13 +15,11 @@ if(UNIX) + add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class + COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java + MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +- DEPENDS pmdefaults/PmDefaults.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaults.java) + add_custom_command(OUTPUT pmdefaults/PmDefaults.class + COMMAND javac -classpath . pmdefaults/PmDefaults.java + MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- DEPENDS pmdefaults/PmDefaultsFrame.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaultsFrame.java) + add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar + COMMAND cp pmdefaults/portmusic_logo.png . + COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +@@ -31,8 +29,7 @@ if(UNIX) + COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + COMMAND rm portmusic_logo.png + MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- DEPENDS ${PMDEFAULTS_ALL_CLASSES} +- WORKING_DIRECTORY pm_java) ++ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) + add_custom_target(pmdefaults_target ALL + DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") |