From 3273d3bd961a4abcf05141a25e0498192000cb5c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 3 May 2009 14:35:57 +0000 Subject: upgraded Mac OS X build machines to libquicktime 1.1.1 svn path=/trunk/; revision=11218 --- packages/darwin_app/Makefile | 4 ++-- .../patches/libquicktime_plugin_support-0.39.2.patch | 19 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 packages/patches/libquicktime_plugin_support-0.39.2.patch diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index 2552fa1a..4b994de1 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -163,8 +163,8 @@ pdp_help_hack: darwin_app_embed_libs: # embed libquicktime plugins - install -d $(PD_APP_CONTENTS)/lib/libquicktime - install -p /sw/lib/libquicktime/*.so $(PD_APP_CONTENTS)/lib/libquicktime + install -d $(PD_APP_CONTENTS)/lib/libquicktime1 + install -p /sw/lib/libquicktime1/*.so $(PD_APP_CONTENTS)/lib/libquicktime1 ./embed-MacOSX-dependencies.sh $(PD_APP_CONTENTS) # shortcut to install the readme on non-Extended builds diff --git a/packages/patches/libquicktime_plugin_support-0.39.2.patch b/packages/patches/libquicktime_plugin_support-0.39.2.patch deleted file mode 100644 index d1864cb3..00000000 --- a/packages/patches/libquicktime_plugin_support-0.39.2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.25 -diff -u -w -r1.25 u_main.tk ---- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25 -+++ u_main.tk 15 Aug 2007 22:26:47 -0000 -@@ -55,6 +55,11 @@ - set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]] - set pd_guidir $pd_gui2/.. - load $pd_guidir/bin/libPdTcl.dylib -+# this is the embedded libquicktime can find its embedded plugins -+ set libquicktime_plugin_dir \ -+ [file normalize $pd_gui2/../../lib/libquicktime] -+ puts stderr "Setting LIBQUICKTIME_PLUGIN_DIR: $libquicktime_plugin_dir" -+ set env(LIBQUICKTIME_PLUGIN_DIR) $libquicktime_plugin_dir - set pd_tearoff 0 - global pd_macready - set pd_macready 0 -- cgit v1.2.1