rendered paste bodyIndex: contrib/patch-libdvdread-css-vlc-dylib.patch===================================================================--- contrib/patch-libdvdread-css-vlc-dylib.patch (revision 0)+++ contrib/patch-libdvdread-css-vlc-dylib.patch (revision 0)@@ -0,0 +1,11 @@+--- dvdread/dvd_input.c 2005-09-19 09:43:08.000000000 -0400++++ dvdread/patched-dvd_input.c 2008-03-19 12:47:16.000000000 -0400+@@ -332,7 +332,7 @@+ + #else+ +- dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);++ dvdcss_library = dlopen("/Applications/VLC.app/Contents/MacOS/lib/vlc_libdvdcss.dylib", RTLD_LAZY);+ + if(dvdcss_library != NULL) {+ #if defined(__OpenBSD__) && !defined(__ELF__)Index: contrib/Jamfile===================================================================--- contrib/Jamfile (revision 1341)+++ contrib/Jamfile (working copy)@@ -102,7 +102,7 @@ LibAvUtil $(SUBDIR)/lib/libswscale.a : $(SUBDIR)/lib/libavcodec.a ; # CSS doesn't work on Cygwin/Windows as of now, so don't use it.-if $(OS) != CYGWIN+if $(OS) != CYGWIN && $(OS) != MACOSX { # libdvdcss # We need libdvdcss.so for libdvdread's configure to work...@@ -115,7 +115,7 @@ { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && - cd libdvdcss &&+ cd libdvdcss-1.2.9 && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libdvdcss.a }@@ -145,8 +145,14 @@ { Depends $(<) : $(>) ; Depends lib : $(<) ;+ + if $(OS) = MACOSX+ {+ DVDREAD_PATCH = "$(PATCH) -p0 < ../patch-libdvdread-css-vlc-dylib.patch " ;+ }+ }-if $(OS) != CYGWIN+if $(OS) != CYGWIN && $(OS) != MACOSX { actions LibDvdRead {@@ -161,11 +167,13 @@ else { # Cygwin/Windows doesn't use CSS as of now, so don't include it on the # configure line.+ # MacOSX uses a dylib for CSS, so it doesn't need including there either. actions LibDvdRead { cd `dirname $(>)` && CONTRIB=`pwd` &&- rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && - cd libdvdread &&+ rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) &&+ + cd libdvdread && $(DVDREAD_PATCH) && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libdvdread.aIndex: contrib/version_libdvdcss.txt===================================================================--- contrib/version_libdvdcss.txt (revision 1341)+++ contrib/version_libdvdcss.txt (working copy)@@ -1 +1 @@-http://download.m0k.org/handbrake/contrib/libdvdcss-1.2.9.tar.gz+http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.gz\ No newline at end of fileIndex: Jamfile===================================================================--- Jamfile (revision 1341)+++ Jamfile (working copy)@@ -23,7 +23,7 @@ OS = CYGWIN ; } -if $(OS) != CYGWIN+if $(OS) != CYGWIN && $(OS) != MACOSX { HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ; }Index: macosx/HandBrake.xcodeproj/project.pbxproj===================================================================--- macosx/HandBrake.xcodeproj/project.pbxproj (revision 1341)+++ macosx/HandBrake.xcodeproj/project.pbxproj (working copy)@@ -970,7 +970,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1031,7 +1030,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1090,7 +1088,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1176,7 +1173,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1221,7 +1217,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1341,7 +1336,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1384,7 +1378,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1440,7 +1433,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,@@ -1499,7 +1491,6 @@ ../contrib/lib/libavcodec.a, ../contrib/lib/libavutil.a, ../contrib/lib/libdvdread.a,- ../contrib/lib/libdvdcss.a, ../contrib/lib/libfaac.a, ../contrib/lib/libmp3lame.a, ../contrib/lib/libmpeg2.a,