media-libs/portmidi: Added patch to fix compalation problems with cmake 2.8.6, thanks...

svn path=/sunrise/; revision=12626

diff --git a/media-libs/portmidi/ChangeLog b/media-libs/portmidi/ChangeLog
index 030b3dd5596fc24d7a89b916ec0f54a201bc0c7c..f997c5373f3b4e2c0fac626cf1edcfe896ee470c 100644 (file)
--- a/media-libs/portmidi/ChangeLog
+++ b/media-libs/portmidi/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-libs/portmidi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jan 2012; Alex Barker (KWhat) <alex@1stleg.com> -portmidi-217.ebuild,
+  +portmidi-217-r1.ebuild,
+  +files/portmidi-217-cmake-workdir-java-opts.patch:
+  Added patch to fix compalation problems with cmake 2.8.6, thanks Tommy[D]
+
   13 May 2011; Alex Barker (KWhat) <alex@1stleg.com> portmidi-217.ebuild:
   Fix for multi Python ABI and restriced Python 3
 

diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index e25ed9cb8d293964654db6683283b997d5a8949a..4d677def82cd448b57c74c1a3c83a392a7666ec9 100644 (file)
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,6 +1,7 @@
 AUX portmidi-217-cmake-libdir-java-opts.patch 8488 RMD160 1406b491ff4f2f4fa37144279a69a13142b007b9 SHA1 6a343969f3a224351e4f1fda49de3c430a6acaef SHA256 d0383ccd61281fc4f5730f48a3cea36c4c309a234ae0ebb04b18c760ace272c9
+AUX portmidi-217-cmake-workdir-java-opts.patch 1365 RMD160 a225f3a80ab0c3848aea270a11da823c41ab604a SHA1 210aafac2664d577a187cf76d56ea2a7e301500b SHA256 e32b95e78882665d43243471b5e68f40525b809322f5ca1f1e3f0e0f4ad6cdd7
 AUX portmidi-217-python-setup.py.patch 604 RMD160 785a4ec1e67cf36a7fafa3c4fe9017bef68b9efa SHA1 8cbdcb76ac08f267f95c2a2542dcbe175125fa91 SHA256 46af585e865bb509f4c91b03aa3e39218ba3fc312067587d147c5f217a934f1d
 DIST portmidi-src-217.zip 1030830 RMD160 f83aa8288063690ff60654fa291e2982ba637633 SHA1 f45bf4e247c0d7617deacd6a65d23d9fddae6117 SHA256 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f
-EBUILD portmidi-217.ebuild 4509 RMD160 b122f511a8e34d4aae26437b999f7d0b3f24f5a1 SHA1 c5a31cb7bcae868cf711589b382bdf5b1b0b788c SHA256 7650dda714015cc99b911d5ff32d665019d3f068b7069e125fdc7caa85b334b3
-MISC ChangeLog 826 RMD160 1099677138782b1443e5bab5d73773688e421386 SHA1 bf445ce1b32a4bbcca23a2ecb99e1ca3b02715bb SHA256 db64834501bb7853031bc03f4a4db31c0c2b7ee7e760094c059518e99ad35868
+EBUILD portmidi-217-r1.ebuild 4600 RMD160 04f91e3adb687f5f9cb6bab18be756c433295da4 SHA1 cf8af23ddab5ef7d2df73d5dbc2a455089d761ca SHA256 d53ca6421bd7bd37200d3a59f9568d652c490b102f274ef52726bfe052339c9b
+MISC ChangeLog 1058 RMD160 e5a470d0e1c6b01ad7794ed93512d1438d2a05eb SHA1 a843565cb8c367f9644687e8e923efd0ea6040e0 SHA256 7a72d93a746b63405a9fee70492cbaeb3cd4814383dbf3b6af1b8b30936af666
 MISC metadata.xml 312 RMD160 f32b80a978189a42e57d835146e1a3e8a5e01da4 SHA1 8c05f50e5aeae25f5e486fd2414ba64f003c0bc7 SHA256 784f9f1dfb455e3f1b2ce86308786eed3071cd7746da978b754d3ae3164030c7

diff --git a/media-libs/portmidi/files/portmidi-217-cmake-workdir-java-opts.patch b/media-libs/portmidi/files/portmidi-217-cmake-workdir-java-opts.patch
new file mode 100644 (file)
index 0000000..c366ec9
--- /dev/null
+++ b/media-libs/portmidi/files/portmidi-217-cmake-workdir-java-opts.patch
@@ -0,0 +1,28 @@
+--- portmidi/pm_java/CMakeLists.orig.txt       2009-11-04 16:20:44.000000000 +0100
++++ portmidi/pm_java/CMakeLists.txt            2011-12-31 17:05:00.947190094 +0100
+@@ -15,13 +15,11 @@
+     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 @@
+       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")

diff --git a/media-libs/portmidi/portmidi-217.ebuild b/media-libs/portmidi/portmidi-217-r1.ebuild
similarity index 97%
rename from media-libs/portmidi/portmidi-217.ebuild
rename to media-libs/portmidi/portmidi-217-r1.ebuild
index 36d4df3f6be973c047e89f5d01338c5f748ff4bc..255f0420398a9c0fa82b24e32673cd2e5deacf33 100644 (file)
--- a/media-libs/portmidi/portmidi-217.ebuild
+++ b/media-libs/portmidi/portmidi-217-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -51,6 +51,9 @@ src_prepare() {
        # allows java to be enabled/disabled
        epatch "${FILESDIR}/${P}-cmake-libdir-java-opts.patch"
 
+       # fix problems with cmake 2.8.6
+       epatch "${FILESDIR}/${P}-cmake-workdir-java-opts.patch"
+
        # find the header and our compiled libs in the distutils setup.py
        epatch "${FILESDIR}/${P}-python-setup.py.patch"