Ticket #5370: HandBrake.patch

aqua/HandBrake/files/patch-Jamrules

@@ +1 @@
+--- Jamrules.orig       2004-05-25 19:51:32.000000000 +0200
++++ Jamrules    2005-10-13 12:17:31.000000000 +0200
+@@ -8,10 +8,10 @@
+ LANGUAGES  = fr de it pl ru nl es pt ja ;
+ 
+ # Compilers & flags
+-CC      = gcc ;
+-C++     = g++ ;
++CC      = gcc-3.3 ;
++C++     = g++-3.3 ;
+ AS      = nasm ;
+-LINK    = g++ ;
++LINK    = g++-3.3 ;
+ OPTIM   = -O3 -funroll-loops ;
+ DEFINES = HB_$(OS) HB_VERSION=\\\"$(HB_VERSION)\\\" ;

aqua/HandBrake/files/patch-Jamrules_xcode2.1

@@ +1 @@
+--- Jamrules.orig       2004-05-25 19:51:32.000000000 +0200
++++ Jamrules    2005-10-13 12:17:31.000000000 +0200
+@@ -122,9 +124,9 @@
+ }
+ actions BuildOSXApp
+ {
+-    $(RM) $(<) macosx/build/HandBrake.app && \
++    $(RM) $(<) macosx/build/Default/HandBrake.app && \
+       ( cd macosx && xcodebuild ) && \
+-      cp -r macosx/build/HandBrake.app $(<) && \
++      cp -r macosx/build/Default/HandBrake.app $(<) && \
+       for i in $(LANGUAGES) ; do \
+         ( cd $(<)/Contents/Resources && \
+           cp -r English.lproj $i.lproj && \

aqua/HandBrake/files/patch-project.pbxproj

@@ +1 @@
+--- macosx/HandBrake.xcode/project.pbxproj.orig 2004-05-25 19:51:38.000000000 +0200
++++ macosx/HandBrake.xcode/project.pbxproj      2005-10-13 12:17:29.000000000 +0200
+@@ -268,7 +268,7 @@
+                                OTHER_LDFLAGS = "../core/libhb.a ../contrib/liba52/liba52.a ../contrib/libavcodec/libavcodec.a ../contrib/libdvdread/libdvdread.a ../contrib/libdvdcss/libdvdcss.a ../contrib/libfaac/libfaac.a ../contrib/libmp3lame/libmp3lame.a ../contrib/libmp4v2/libmp4v2.a ../contrib/libmpeg2/libmpeg2.a ../contrib/libvorbis/libvorbis.a ../contrib/libvorbis/libvorbisenc.a ../contrib/libogg/libogg.a ../contrib/libsamplerate/libsamplerate.a ../contrib/libx264/libx264.a ../contrib/libxvidcore/libxvidcore.a";
+                                PRODUCT_NAME = HandBrake;
+                                SECTORDER_FLAGS = "";
+-                               WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
++                               WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -Wno-sequence-point";
+                                WRAPPER_EXTENSION = app;
+                        };
+                        dependencies = (

aqua/HandBrake/files/patch-Controller.mm

@@ +1 @@
+--- macosx/Controller.mm.orgi   2004-05-25 19:51:38.000000000 +0200
++++ macosx/Controller.mm        2005-10-13 12:17:29.000000000 +0200
+@@ -623,7 +623,7 @@
+     drivesList = [NSMutableArray arrayWithCapacity: 1];
+ 
+     next_media = IOIteratorNext( media_iterator );
+-    if( next_media != NULL )
++    if( next_media != 0 )
+     {
+         char psz_buf[0x32];
+         size_t dev_path_length;
+@@ -657,7 +657,7 @@
+ 
+             IOObjectRelease( next_media );
+ 
+-        } while( ( next_media = IOIteratorNext( media_iterator ) ) != NULL );
++        } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
+     }
+ 
+     IOObjectRelease( media_iterator );

aqua/HandBrake/Portfile

@@ -26 +26 @@
 use_configure   no
 build.cmd       jam
 build.target
+
+patchfiles      patch-project.pbxproj patch-Jamrules patch-Controller.mm
+
+if {$xcodeversion == "2.1"} {
+    patchfiles-append      patch-Jamrules_xcode2.1
+}
+
 destroot        {
         set appPath ${destroot}/Applications/DarwinPorts
         xinstall -d -m 755 ${appPath}