Commits the 64-bit Windows binaries and fixes contributed by Sebastien Vincent on the dev mailing list in an e-mail with the subject '[Patch] Windows 64 bit support'.

build.xml

@@ -40,7 +40,6 @@
     <property name="release.src" value="${release}/install"/>
     <property name="resources" value="${dest}/resources"/>
     <property name="inst.resrc" value="${sc.basedir}/resources/install"/>
-    <property name="path" value="${lib}/native/windows;${system.PATH}"/>
     <property name='j2se_api' value='http://java.sun.com/j2se/1.5/docs/api' />
     <property name='maxwarns' value='10000' />
     <property name='java.net.preferIPv6Addresses' value='true' />
@@ -60,6 +59,24 @@
         <isset property="is.running.windows"/>
     </condition>
 
+    <!-- Make sure we use the windows-64 natives if this is 64-bit Windows -->
+    <condition property="path"
+            value="${lib}/native/windows-64:${system.PATH}">
+        <and>
+            <isset property="is.running.windows"/>
+            <os arch="amd64" />
+        </and>
+    </condition>
+    <!-- Otherwise and if this is still Windows, go for the windows natives
+         (i.e. os.arch==i386) -->
+    <condition property="path"
+            value="${lib}/native/windows:${system.PATH}">
+        <isset property="is.running.windows"/>
+    </condition>
+    <!-- At last i.e. if this is not Windows, use the system PATH environment
+         variable -->
+    <property name="path" value="${system.PATH}"/>
+
     <condition property="bundles.dest.os" value="${bundles.dest.win}">
         <isset property="is.running.windows"/>
     </condition>
@@ -75,7 +92,7 @@
 
     <!-- make sure we use the linux-64 natives if this is a 64 bit system-->
     <condition property="ld.library.path"
-              value="${lib}/native/linux-64:${system.LD_LIBRARY_PATH}">
+            value="${lib}/native/linux-64:${system.LD_LIBRARY_PATH}">
         <and>
             <isset property="is.running.linux"/>
             <os arch="amd64" />
@@ -83,8 +100,8 @@
     </condition>
     <!-- otherwise we go for the normal linuxnatives (i.e. os.arch==i386)-->
     <condition property="ld.library.path"
-                  value="${lib}/native/linux:${system.LD_LIBRARY_PATH}">
-                <isset property="is.running.linux"/>
+            value="${lib}/native/linux:${system.LD_LIBRARY_PATH}">
+        <isset property="is.running.linux"/>
     </condition>
 
     <condition property="bundles.dest.os" value="${bundles.dest.lin}">

src/native/ffmpeg/README

@@ -2,8 +2,12 @@
 
 - Windows
 
+32-bit
 ./configure --disable-pthread
 
+64-bit
+./configure --disable-pthread --disable-avis-input --disable-asm
+
 - Linux, Mac OS X
 
 ./configure --enable-pic
@@ -12,6 +16,7 @@
 
 - Windows
 
+32-bit
 ./configure \
   --target-os=mingw32 \
   --disable-mmx --enable-memalign-hack \
@@ -26,6 +31,26 @@
   --disable-ffserver --disable-ffplay --disable-ffmpeg \
   --disable-pthreads --enable-w32threads
 
+64-bit
+Edit configure script and remove the following lines:
+check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
+    die "ERROR: MinGW runtime version must be >= 3.15."
+
+Then run:
+./configure \
+  --arch=amd64 --target-os=mingw32 \
+  --disable-mmx --enable-memalign-hack \
+  --enable-static --disable-shared --shlibdir=. \
+  --disable-encoders --disable-decoders --disable-muxers --disable-demuxers \
+  --disable-parsers --disable-bsfs --disable-protocols --disable-devices \
+  --disable-network \
+  --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \
+  --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \
+  --extra-ldflags=-L$X264_HOME --extra-cflags=-I$X264_HOME \
+  --disable-debug \
+  --disable-ffserver --disable-ffplay --disable-ffmpeg \
+  --disable-pthreads --enable-w32threads
+
 - Linux
 
 ./configure \

src/native/portaudio/README

@@ -6,22 +6,41 @@
     ./configure  --enable-static --disable-shared --with-pic --with-jack=no & make
 
     - Mac OS X
-    $./configure  --enable-static --disable-shared & make
+    $./configure  --enable-static --disable-shared && make
 
     - Windows
-    $./configure  --enable-static --disable-shared & make
+    $./configure  --enable-static --disable-shared && make
+    
+    Note for Windows x64, edit Makefile (after ./configure) and modify
+    %.lo: %.c $(MAKEFILE) $(PAINC)
+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
+
+    %.o: %.cpp $(MAKEFILE) $(PAINC)
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+   by 
+   %.lo: %.c $(MAKEFILE) $(PAINC)
+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ ; sleep 1
+
+   %.o: %.cpp $(MAKEFILE) $(PAINC)
+	$(CXX) -c $(CXXFLAGS) $< -o $@ ; sleep 1
+
+   Finally add src/os/win32/pa_win_waveformat.o to OTHER_OBJS
+
 2. speex
+    - Windows
+    $./configure --enable-static --disable-shared && make
+
     - Linux
-    $./configure --enable-static --disable-shared & make
+    $./configure --enable-static --disable-shared && make
 
     - Linux amd64
-    $./configure --enable-static --disable-shared --with-pic & make
+    $./configure --enable-static --disable-shared --with-pic && make
 
     - Macosx
     $export CC="gcc -arch i386 -arch ppc -arch x86_64 -mmacosx-version-min=10.4"
     $export CPP="gcc -E"
     $export MACOSX_DEPLOYMENT_TARGET=10.4
-    $./configure --enable-static --disable-shared & make
+    $./configure --enable-static --disable-shared && make
 
 3. jportaudio
     - Linux

src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java

@@ -192,13 +192,9 @@ private void detectCaptureDevices()
      */
     private boolean isFMJVideoAvailable()
     {
-        if (OSUtils.isMac() &&
-            System.getProperty("java.version").startsWith("1.6"))
-        {
-            return false;
-        }
-
-        return true;
+        return
+            !(OSUtils.isMac()
+                && System.getProperty("java.version").startsWith("1.6"));
     }
 
     /**
@@ -272,17 +268,34 @@ public static void setupJMF()
     @SuppressWarnings("unchecked") //legacy JMF code.
     private static void setupRenderers()
     {
-        if (OSUtils.isWindows("Vista"))
+        Vector<String> renderers =
+            PlugInManager.getPlugInList(null, null, PlugInManager.RENDERER);
+
+        if(OSUtils.isWindows())
         {
-            /*
-             * DDRenderer will cause Windows Vista to switch its theme from Aero
-             * to Vista Basic so try to pick up a different Renderer.
-             */
-            Vector<String> renderers =
-                PlugInManager.getPlugInList(null, null, PlugInManager.RENDERER);
-
-            if (renderers.contains("com.sun.media.renderer.video.GDIRenderer"))
+            if (OSUtils.isWindows("Vista"))
             {
+                /*
+                 * DDRenderer will cause Windows Vista to switch its theme from
+                 * Aero to Vista Basic so try to pick up a different Renderer.
+                 */
+                if (renderers
+                        .contains("com.sun.media.renderer.video.GDIRenderer"))
+                {
+                    PlugInManager.removePlugIn(
+                        "com.sun.media.renderer.video.DDRenderer",
+                        PlugInManager.RENDERER);
+                }
+            }
+            else if (OSUtils.isWindows64())
+            {
+                /*
+                 * Remove native renderers for Windows x64 because native JMF libs
+                 * are not available for 64 bit machines
+                 */
+                PlugInManager.removePlugIn(
+                    "com.sun.media.renderer.video.GDIRenderer",
+                    PlugInManager.RENDERER);
                 PlugInManager.removePlugIn(
                     "com.sun.media.renderer.video.DDRenderer",
                     PlugInManager.RENDERER);
@@ -290,9 +303,6 @@ private static void setupRenderers()
         }
         else if(!OSUtils.isLinux32())
         {
-            Vector<String> renderers =
-                PlugInManager.getPlugInList(null, null, PlugInManager.RENDERER);
-
             if (renderers.contains("com.sun.media.renderer.video.LightWeightRenderer") ||
                 renderers.contains("com.sun.media.renderer.video.AWTRenderer"))
             {