summaryrefslogtreecommitdiffstats
path: root/contrib/libdvdread
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-06-04 16:27:15 +0000
committerjstebbins <[email protected]>2010-06-04 16:27:15 +0000
commit6141bbf563d067e4c2574f85871f1da4e1b664f2 (patch)
tree9b1a255082154ad1121895ecdb52a2cba60f7734 /contrib/libdvdread
parent70ee5abfc5b28c7ed2f26ef0ec63a678d3681704 (diff)
MacGui: Add flexible dylib path manipulation so that we can handle external dylibs more easily
At startup, add any extra dylib paths to DYLD_FALLBACK_LIBRARY_PATH. This is the last path searched by the system for dylibs and we add our paths to the end of it's list, so this will never override any system libs or paths the user has explicitly set. Since applications read the environment once at startup, these changes don't take effect until we restart with execv. In order to avoid a possible exec bomb, we add a parameter to the argv list to prevent any further exec's. Note that this causes a minor glitch when running under gdb. The execv triggers a trap. You just have to 'continue'. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3351 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/libdvdread')
-rw-r--r--contrib/libdvdread/P00-darwin-css-vlc-dylib.patch12
1 files changed, 0 insertions, 12 deletions
diff --git a/contrib/libdvdread/P00-darwin-css-vlc-dylib.patch b/contrib/libdvdread/P00-darwin-css-vlc-dylib.patch
deleted file mode 100644
index d6c5f6d57..000000000
--- a/contrib/libdvdread/P00-darwin-css-vlc-dylib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libdvdread.orig/src/dvd_input.c libdvdread/src/dvd_input.c
---- libdvdread.orig/src/dvd_input.c 2009-01-08 14:57:10.000000000 -0800
-+++ libdvdread/src/dvd_input.c 2009-04-24 09:02:34.000000000 -0700
-@@ -285,7 +285,7 @@
- /* dlopening libdvdcss */
-
- #ifdef __APPLE__
-- #define CSS_LIB "libdvdcss.2.dylib"
-+ #define CSS_LIB "/Applications/VLC.app/Contents/MacOS/lib/libdvdcss.2.dylib"
- #elif defined(WIN32)
- #define CSS_LIB "libdvdcss.dll"
- #elif defined(__OS2__)